commit OpenOffice_org-help-en-US for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package OpenOffice_org-help-en-US for openSUSE:Factory checked in at Wed Sep 22 10:54:06 CEST 2010. -------- --- OpenOffice_org-help-en-US/OpenOffice_org-help-en-US.changes 2010-06-16 19:49:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-help-en-US/OpenOffice_org-help-en-US.changes 2010-09-15 22:00:38.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Sep 15 20:45:27 CEST 2010 - pmladek@suse.cz + +- updated to version 3.2.98.1 (3.3-alpha1) +- used the prepatched OOo sources from ooo-build git + +------------------------------------------------------------------- +Thu Sep 2 15:45:12 CEST 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.1.6 (3.2.1 security update, bnc#629085, + MaintenanceTracker-35044, CVE-2010-2935, CVE-2010-2936) + +------------------------------------------------------------------- +Tue Aug 24 16:37:41 CEST 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.1.5 (3.2.1 security update, bnc#629085, + MaintenanceTracker-35044, CVE-2010-2935, CVE-2010-2936) + +------------------------------------------------------------------- OpenOffice_org-help-group1.changes: same change OpenOffice_org-help-group2.changes: same change OpenOffice_org-help-group3.changes: same change OpenOffice_org-help-group4.changes: same change OpenOffice_org-help-group5.changes: same change calling whatdependson for head-i586 Old: ---- ooo320-m19-help.tar.bz2 New: ---- ooo-build-3.2.98.1-help.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-help-en-US.spec ++++++ --- /var/tmp/diff_new_pack.YINz7W/_old 2010-09-22 10:52:48.000000000 +0200 +++ /var/tmp/diff_new_pack.YINz7W/_new 2010-09-22 10:52:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-en-US (Version 3.2.1.4) +# spec file for package OpenOffice_org-help-en-US (Version 3.2.98.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,15 +22,17 @@ ################################################################### ## DO NOT EDIT THIS SPEC FILE ## Generated by: -## ./ooo-help-gen-spec OpenOffice_org-help-en-US.spec.in ooo-help-en-US +## perl ooo-help-gen-spec OpenOffice_org-help-en-US.spec.in ooo-help-en-US ################################################################### -Version: 3.2.1.4 +Version: 3.2.98.1 Release: 1 -%define ooo_build_version 3.2.1.4 %define piece help +%define ooo_build_version 3.2.98.1 +%define ooo_piece_version 3.2.98.1 %define ooo_langs "en-US" -%define ooo_basis_dir basis3.2 +%define ooo_sourcedirname ooo-build-%ooo_piece_version %define ooo_home ooo3 +%define ooo_basis_dir basis3.3 #!BuildIgnore: OpenOffice_org # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 BuildRequires: java-devel perl-Archive-Zip unzip zip @@ -42,9 +44,6 @@ # needed by perl-Archive-Zip; is included in main perl package on newer distros BuildRequires: perl-Compress-Zlib %endif -%define ooo_prefix %_libdir -%define ooo_home ooo3 -%define ooo_build_tag ooo320-m19 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on @@ -56,7 +55,7 @@ %endif Summary: American Help Localization for OpenOffice.org Url: http://www.openoffice.org/ -Source0: %ooo_build_tag-%piece.tar.bz2 +Source0: ooo-build-%ooo_piece_version-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-en-US.spec.in Source101: ooo-help-gen-spec @@ -86,9 +85,7 @@ %prep -%setup -c -q -n %ooo_build_tag-%piece -# hack to move sources to a reasonable location -mv ooo/*/* . && rm -rf ooo +%setup -q -n ooo-build-%ooo_piece_version-%piece %build # setup env. @@ -102,7 +99,7 @@ export BUILD_HELP_SEPARATELY=YES # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/build-generic %piece %ooo_sourcedirname %install # setup env. @@ -111,7 +108,7 @@ export DESTDIR=$RPM_BUILD_ROOT # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/install-generic %piece %ooo_sourcedirname # prune redundant files the scp2 likes to make for us rm -Rf \ "$DESTDIR/$OO_INSTDIR/basis-link" \ ++++++ OpenOffice_org-help-group1.spec ++++++ --- /var/tmp/diff_new_pack.YINz7W/_old 2010-09-22 10:52:48.000000000 +0200 +++ /var/tmp/diff_new_pack.YINz7W/_new 2010-09-22 10:52:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group1 (Version 3.2.1.4) +# spec file for package OpenOffice_org-help-group1 (Version 3.2.98.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,12 +22,16 @@ ################################################################### ## DO NOT EDIT THIS SPEC FILE ## Generated by: -## ./ooo-help-gen-spec OpenOffice_org-help-groupX.spec.in ooo-help-groupX +## perl ooo-help-gen-spec OpenOffice_org-help-groupX.spec.in ooo-help-groupX ################################################################### -Version: 3.2.1.4 +Version: 3.2.98.1 Release: 1 -%define ooo_build_version 3.2.1.4 %define piece help +%define ooo_build_version 3.2.98.1 +%define ooo_piece_version 3.2.98.1 +%define ooo_sourcedirname ooo-build-%ooo_piece_version +%define ooo_home ooo3 +%define ooo_basis_dir basis3.3 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 @@ -48,8 +52,6 @@ %define ooo_langs "ar cs da de en-GB" %endif %endif -%define ooo_basis_dir basis3.2 -%define ooo_home ooo3 #!BuildIgnore: OpenOffice_org # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 BuildRequires: java-devel perl-Archive-Zip unzip zip @@ -63,13 +65,12 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m19 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on Summary: OpenOffice.org Help Development Url: http://www.openoffice.org/ -Source0: %ooo_build_tag-%piece.tar.bz2 +Source0: ooo-build-%ooo_piece_version-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-groupX.spec.in Source101: ooo-help-gen-spec @@ -184,9 +185,7 @@ %endif %prep -%setup -c -q -n %ooo_build_tag-%piece -# hack to move sources to a reasonable location -mv ooo/*/* . && rm -rf ooo +%setup -q -n ooo-build-%ooo_piece_version-%piece %build # setup env. @@ -200,7 +199,7 @@ export BUILD_HELP_SEPARATELY=YES # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/build-generic %piece %ooo_sourcedirname %install # setup env. @@ -209,7 +208,7 @@ export DESTDIR=$RPM_BUILD_ROOT # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/install-generic %piece %ooo_sourcedirname # prune redundant files the scp2 likes to make for us rm -Rf \ "$DESTDIR/$OO_INSTDIR/basis-link" \ ++++++ OpenOffice_org-help-group2.spec ++++++ --- /var/tmp/diff_new_pack.YINz7W/_old 2010-09-22 10:52:48.000000000 +0200 +++ /var/tmp/diff_new_pack.YINz7W/_new 2010-09-22 10:52:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group2 (Version 3.2.1.4) +# spec file for package OpenOffice_org-help-group2 (Version 3.2.98.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,12 +22,16 @@ ################################################################### ## DO NOT EDIT THIS SPEC FILE ## Generated by: -## ./ooo-help-gen-spec OpenOffice_org-help-groupX.spec.in ooo-help-groupX +## perl ooo-help-gen-spec OpenOffice_org-help-groupX.spec.in ooo-help-groupX ################################################################### -Version: 3.2.1.4 +Version: 3.2.98.1 Release: 1 -%define ooo_build_version 3.2.1.4 %define piece help +%define ooo_build_version 3.2.98.1 +%define ooo_piece_version 3.2.98.1 +%define ooo_sourcedirname ooo-build-%ooo_piece_version +%define ooo_home ooo3 +%define ooo_basis_dir basis3.3 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 @@ -48,8 +52,6 @@ %define ooo_langs "en-ZA es et fr gl" %endif %endif -%define ooo_basis_dir basis3.2 -%define ooo_home ooo3 #!BuildIgnore: OpenOffice_org # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 BuildRequires: java-devel perl-Archive-Zip unzip zip @@ -63,13 +65,12 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m19 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on Summary: OpenOffice.org Help Development Url: http://www.openoffice.org/ -Source0: %ooo_build_tag-%piece.tar.bz2 +Source0: ooo-build-%ooo_piece_version-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-groupX.spec.in Source101: ooo-help-gen-spec @@ -172,9 +173,7 @@ %endif %prep -%setup -c -q -n %ooo_build_tag-%piece -# hack to move sources to a reasonable location -mv ooo/*/* . && rm -rf ooo +%setup -q -n ooo-build-%ooo_piece_version-%piece %build # setup env. @@ -188,7 +187,7 @@ export BUILD_HELP_SEPARATELY=YES # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/build-generic %piece %ooo_sourcedirname %install # setup env. @@ -197,7 +196,7 @@ export DESTDIR=$RPM_BUILD_ROOT # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/install-generic %piece %ooo_sourcedirname # prune redundant files the scp2 likes to make for us rm -Rf \ "$DESTDIR/$OO_INSTDIR/basis-link" \ ++++++ OpenOffice_org-help-group3.spec ++++++ --- /var/tmp/diff_new_pack.YINz7W/_old 2010-09-22 10:52:48.000000000 +0200 +++ /var/tmp/diff_new_pack.YINz7W/_new 2010-09-22 10:52:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group3 (Version 3.2.1.4) +# spec file for package OpenOffice_org-help-group3 (Version 3.2.98.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,12 +22,16 @@ ################################################################### ## DO NOT EDIT THIS SPEC FILE ## Generated by: -## ./ooo-help-gen-spec OpenOffice_org-help-groupX.spec.in ooo-help-groupX +## perl ooo-help-gen-spec OpenOffice_org-help-groupX.spec.in ooo-help-groupX ################################################################### -Version: 3.2.1.4 +Version: 3.2.98.1 Release: 1 -%define ooo_build_version 3.2.1.4 %define piece help +%define ooo_build_version 3.2.98.1 +%define ooo_piece_version 3.2.98.1 +%define ooo_sourcedirname ooo-build-%ooo_piece_version +%define ooo_home ooo3 +%define ooo_basis_dir basis3.3 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 @@ -48,8 +52,6 @@ %define ooo_langs "gu hi-IN hu it ja km" %endif %endif -%define ooo_basis_dir basis3.2 -%define ooo_home ooo3 #!BuildIgnore: OpenOffice_org # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 BuildRequires: java-devel perl-Archive-Zip unzip zip @@ -63,13 +65,12 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m19 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on Summary: OpenOffice.org Help Development Url: http://www.openoffice.org/ -Source0: %ooo_build_tag-%piece.tar.bz2 +Source0: ooo-build-%ooo_piece_version-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-groupX.spec.in Source101: ooo-help-gen-spec @@ -201,9 +202,7 @@ %endif %prep -%setup -c -q -n %ooo_build_tag-%piece -# hack to move sources to a reasonable location -mv ooo/*/* . && rm -rf ooo +%setup -q -n ooo-build-%ooo_piece_version-%piece %build # setup env. @@ -217,7 +216,7 @@ export BUILD_HELP_SEPARATELY=YES # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/build-generic %piece %ooo_sourcedirname %install # setup env. @@ -226,7 +225,7 @@ export DESTDIR=$RPM_BUILD_ROOT # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/install-generic %piece %ooo_sourcedirname # prune redundant files the scp2 likes to make for us rm -Rf \ "$DESTDIR/$OO_INSTDIR/basis-link" \ ++++++ OpenOffice_org-help-group4.spec ++++++ --- /var/tmp/diff_new_pack.YINz7W/_old 2010-09-22 10:52:48.000000000 +0200 +++ /var/tmp/diff_new_pack.YINz7W/_new 2010-09-22 10:52:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group4 (Version 3.2.1.4) +# spec file for package OpenOffice_org-help-group4 (Version 3.2.98.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,12 +22,16 @@ ################################################################### ## DO NOT EDIT THIS SPEC FILE ## Generated by: -## ./ooo-help-gen-spec OpenOffice_org-help-groupX.spec.in ooo-help-groupX +## perl ooo-help-gen-spec OpenOffice_org-help-groupX.spec.in ooo-help-groupX ################################################################### -Version: 3.2.1.4 +Version: 3.2.98.1 Release: 1 -%define ooo_build_version 3.2.1.4 %define piece help +%define ooo_build_version 3.2.98.1 +%define ooo_piece_version 3.2.98.1 +%define ooo_sourcedirname ooo-build-%ooo_piece_version +%define ooo_home ooo3 +%define ooo_basis_dir basis3.3 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 @@ -48,8 +52,6 @@ %define ooo_langs "ko nl pa-IN pl pt" %endif %endif -%define ooo_basis_dir basis3.2 -%define ooo_home ooo3 #!BuildIgnore: OpenOffice_org # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 BuildRequires: java-devel perl-Archive-Zip unzip zip @@ -63,13 +65,12 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m19 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on Summary: OpenOffice.org Help Development Url: http://www.openoffice.org/ -Source0: %ooo_build_tag-%piece.tar.bz2 +Source0: ooo-build-%ooo_piece_version-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-groupX.spec.in Source101: ooo-help-gen-spec @@ -172,9 +173,7 @@ %endif %prep -%setup -c -q -n %ooo_build_tag-%piece -# hack to move sources to a reasonable location -mv ooo/*/* . && rm -rf ooo +%setup -q -n ooo-build-%ooo_piece_version-%piece %build # setup env. @@ -188,7 +187,7 @@ export BUILD_HELP_SEPARATELY=YES # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/build-generic %piece %ooo_sourcedirname %install # setup env. @@ -197,7 +196,7 @@ export DESTDIR=$RPM_BUILD_ROOT # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/install-generic %piece %ooo_sourcedirname # prune redundant files the scp2 likes to make for us rm -Rf \ "$DESTDIR/$OO_INSTDIR/basis-link" \ ++++++ OpenOffice_org-help-group5.spec ++++++ --- /var/tmp/diff_new_pack.YINz7W/_old 2010-09-22 10:52:48.000000000 +0200 +++ /var/tmp/diff_new_pack.YINz7W/_new 2010-09-22 10:52:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group5 (Version 3.2.1.4) +# spec file for package OpenOffice_org-help-group5 (Version 3.2.98.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,12 +22,16 @@ ################################################################### ## DO NOT EDIT THIS SPEC FILE ## Generated by: -## ./ooo-help-gen-spec OpenOffice_org-help-groupX.spec.in ooo-help-groupX +## perl ooo-help-gen-spec OpenOffice_org-help-groupX.spec.in ooo-help-groupX ################################################################### -Version: 3.2.1.4 +Version: 3.2.98.1 Release: 1 -%define ooo_build_version 3.2.1.4 %define piece help +%define ooo_build_version 3.2.98.1 +%define ooo_piece_version 3.2.98.1 +%define ooo_sourcedirname ooo-build-%ooo_piece_version +%define ooo_home ooo3 +%define ooo_basis_dir basis3.3 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 @@ -48,8 +52,6 @@ %define ooo_langs "pt-BR ru sl sv zh-CN zh-TW" %endif %endif -%define ooo_basis_dir basis3.2 -%define ooo_home ooo3 #!BuildIgnore: OpenOffice_org # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 BuildRequires: java-devel perl-Archive-Zip unzip zip @@ -63,13 +65,12 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m19 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on Summary: OpenOffice.org Help Development Url: http://www.openoffice.org/ -Source0: %ooo_build_tag-%piece.tar.bz2 +Source0: ooo-build-%ooo_piece_version-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-groupX.spec.in Source101: ooo-help-gen-spec @@ -189,9 +190,7 @@ %endif %prep -%setup -c -q -n %ooo_build_tag-%piece -# hack to move sources to a reasonable location -mv ooo/*/* . && rm -rf ooo +%setup -q -n ooo-build-%ooo_piece_version-%piece %build # setup env. @@ -205,7 +204,7 @@ export BUILD_HELP_SEPARATELY=YES # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/build-generic %piece %ooo_sourcedirname %install # setup env. @@ -214,7 +213,7 @@ export DESTDIR=$RPM_BUILD_ROOT # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/install-generic %piece %ooo_sourcedirname # prune redundant files the scp2 likes to make for us rm -Rf \ "$DESTDIR/$OO_INSTDIR/basis-link" \ ++++++ ooo-help-gen-spec ++++++ --- /var/tmp/diff_new_pack.YINz7W/_old 2010-09-22 10:52:48.000000000 +0200 +++ /var/tmp/diff_new_pack.YINz7W/_new 2010-09-22 10:52:48.000000000 +0200 @@ -251,7 +251,7 @@ my $do_not_edit = "###################################################################\n" . "## DO NOT EDIT THIS SPEC FILE\n" . "## Generated by:\n" . - "## ./ooo-help-gen-spec $args\n" . + "## perl ooo-help-gen-spec $args\n" . "###################################################################"; ++++++ OpenOffice_org-help-en-US.spec.in ++++++ --- /var/tmp/diff_new_pack.YINz7W/_old 2010-09-22 10:52:49.000000000 +0200 +++ /var/tmp/diff_new_pack.YINz7W/_new 2010-09-22 10:52:49.000000000 +0200 @@ -19,13 +19,15 @@ Name: OpenOffice_org-help-en-US @DO_NOT_EDIT_COMMENT@ -Version: 3.2.1.4 +Version: 3.2.98.1 Release: 1 -%define ooo_build_version 3.2.1.4 -%define piece help -%define ooo_langs "en-US" -%define ooo_basis_dir basis3.2 -%define ooo_home ooo3 +%define piece help +%define ooo_build_version 3.2.98.1 +%define ooo_piece_version 3.2.98.1 +%define ooo_langs "en-US" +%define ooo_sourcedirname ooo-build-%ooo_piece_version +%define ooo_home ooo3 +%define ooo_basis_dir basis3.3 #!BuildIgnore: OpenOffice_org # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 BuildRequires: java-devel perl-Archive-Zip unzip zip @@ -37,9 +39,6 @@ # needed by perl-Archive-Zip; is included in main perl package on newer distros BuildRequires: perl-Compress-Zlib %endif -%define ooo_prefix %_libdir -%define ooo_home ooo3 -%define ooo_build_tag ooo320-m19 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on @@ -51,7 +50,7 @@ %endif Summary: American Help Localization for OpenOffice.org Url: http://www.openoffice.org/ -Source0: %ooo_build_tag-%piece.tar.bz2 +Source0: ooo-build-%ooo_piece_version-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-en-US.spec.in Source101: ooo-help-gen-spec @@ -81,9 +80,7 @@ %prep -%setup -c -q -n %ooo_build_tag-%piece -# hack to move sources to a reasonable location -mv ooo/*/* . && rm -rf ooo +%setup -q -n ooo-build-%ooo_piece_version-%piece %build # setup env. @@ -97,7 +94,7 @@ export BUILD_HELP_SEPARATELY=YES # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/build-generic %piece %ooo_sourcedirname %install # setup env. @@ -106,7 +103,7 @@ export DESTDIR=$RPM_BUILD_ROOT # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/install-generic %piece %ooo_sourcedirname # prune redundant files the scp2 likes to make for us rm -Rf \ "$DESTDIR/$OO_INSTDIR/basis-link" \ ++++++ OpenOffice_org-help-groupX.spec.in ++++++ --- /var/tmp/diff_new_pack.YINz7W/_old 2010-09-22 10:52:49.000000000 +0200 +++ /var/tmp/diff_new_pack.YINz7W/_new 2010-09-22 10:52:49.000000000 +0200 @@ -19,10 +19,14 @@ Name: OpenOffice_org-help-group@GROUP_NUMBER@ @DO_NOT_EDIT_COMMENT@ -Version: 3.2.1.4 +Version: 3.2.98.1 Release: 1 -%define ooo_build_version 3.2.1.4 -%define piece help +%define piece help +%define ooo_build_version 3.2.98.1 +%define ooo_piece_version 3.2.98.1 +%define ooo_sourcedirname ooo-build-%ooo_piece_version +%define ooo_home ooo3 +%define ooo_basis_dir basis3.3 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 @@ -43,8 +47,6 @@ %define ooo_langs "@OOO_LANGS_MIN_2@" %endif %endif -%define ooo_basis_dir basis3.2 -%define ooo_home ooo3 #!BuildIgnore: OpenOffice_org # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 BuildRequires: java-devel perl-Archive-Zip unzip zip @@ -58,13 +60,12 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m19 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on Summary: OpenOffice.org Help Development Url: http://www.openoffice.org/ -Source0: %ooo_build_tag-%piece.tar.bz2 +Source0: ooo-build-%ooo_piece_version-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-groupX.spec.in Source101: ooo-help-gen-spec @@ -80,9 +81,7 @@ @SUBPACKAGES_METAINFO@ %prep -%setup -c -q -n %ooo_build_tag-%piece -# hack to move sources to a reasonable location -mv ooo/*/* . && rm -rf ooo +%setup -q -n ooo-build-%ooo_piece_version-%piece %build # setup env. @@ -96,7 +95,7 @@ export BUILD_HELP_SEPARATELY=YES # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/build-generic %piece %ooo_sourcedirname %install # setup env. @@ -105,7 +104,7 @@ export DESTDIR=$RPM_BUILD_ROOT # this spec file is only for few selected localitions to speed the build in BS export FORCE_OOO_LANGS=%ooo_langs -$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/install-generic %piece %ooo_sourcedirname # prune redundant files the scp2 likes to make for us rm -Rf \ "$DESTDIR/$OO_INSTDIR/basis-link" \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de