Hello community, here is the log from the commit of package OpenOffice_org-help-en-US for openSUSE:Factory checked in at Thu Dec 10 12:45:33 CET 2009. -------- --- OpenOffice_org-help-en-US/OpenOffice_org-help-en-US.changes 2009-11-13 18:36:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/OpenOffice_org-help-en-US/OpenOffice_org-help-en-US.changes 2009-12-07 22:27:15.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Dec 7 17:53:37 CET 2009 - pmladek@suse.cz + +- updated to the milestone ooo320-m7 +- updated ooo-build to version 3.1.99.4 (3.2-beta4) +- removed obsolete extra localization sources + +------------------------------------------------------------------- +Tue Nov 24 16:57:27 CET 2009 - pmladek@suse.cz + +- updated to the milestone ooo320-m5 +- updated ooo-build to version 3.1.99.3 (3.2-beta3) + +------------------------------------------------------------------- OpenOffice_org-help-group1.changes: same change OpenOffice_org-help-group2.changes: same change --- OpenOffice_org-help-en-US/OpenOffice_org-help-group3.changes 2009-11-13 18:36:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/OpenOffice_org-help-en-US/OpenOffice_org-help-group3.changes 2009-12-07 23:01:59.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Dec 7 17:53:37 CET 2009 - pmladek@suse.cz + +- updated to the milestone ooo320-m7 +- updated ooo-build to version 3.1.99.4 (3.2-beta4) +- removed obsolete extra localization sources +- used the renamed "gu" instead of "gu-IN" lang code; kept the package + name to keep the backward compatibility + +------------------------------------------------------------------- +Tue Nov 24 16:57:27 CET 2009 - pmladek@suse.cz + +- updated to the milestone ooo320-m5 +- updated ooo-build to version 3.1.99.3 (3.2-beta3) + +------------------------------------------------------------------- --- OpenOffice_org-help-en-US/OpenOffice_org-help-group4.changes 2009-11-13 18:37:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/OpenOffice_org-help-en-US/OpenOffice_org-help-group4.changes 2009-12-07 23:01:59.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Dec 7 17:53:37 CET 2009 - pmladek@suse.cz + +- updated to the milestone ooo320-m7 +- updated ooo-build to version 3.1.99.4 (3.2-beta4) +- removed obsolete extra localization sources + +------------------------------------------------------------------- +Tue Nov 24 16:57:27 CET 2009 - pmladek@suse.cz + +- updated to the milestone ooo320-m5 +- updated ooo-build to version 3.1.99.3 (3.2-beta3) + +------------------------------------------------------------------- OpenOffice_org-help-group5.changes: same change calling whatdependson for head-i586 Old: ---- ooo320-m4-help.tar.bz2 ooo-sdf-help.tar.bz2 New: ---- ooo320-m7-help.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-help-en-US.spec ++++++ --- /var/tmp/diff_new_pack.NZOvTF/_old 2009-12-10 12:43:05.000000000 +0100 +++ /var/tmp/diff_new_pack.NZOvTF/_new 2009-12-10 12:43:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-en-US (Version 3.1.99.2) +# spec file for package OpenOffice_org-help-en-US (Version 3.1.99.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-help-en-US -Version: 3.1.99.2 +Version: 3.1.99.4 Release: 1 -%define ooo_build_version 3.1.99.2 +%define ooo_build_version 3.1.99.4 %define piece help %define ooo_langs "en-US" %define ooo_basis_dir basis3.2 @@ -39,8 +39,8 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m4 -License: LGPL v3 only +%define ooo_build_tag ooo320-m7 +License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on Provides: locale(OpenOffice_org:en_US) @@ -50,7 +50,6 @@ Summary: American Help Localization for OpenOffice.org Url: http://www.openoffice.org/ Source0: %ooo_build_tag-%piece.tar.bz2 -Source1: ooo-sdf-%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 @@ -66,7 +65,7 @@ %package devel PreReq: OpenOffice_org-ure = %version -License: LGPL v3 only +License: LGPLv3 Summary: A Source Package for OpenOffice.org Help Localizations Group: Productivity/Office/Suite AutoReqProv: off @@ -80,7 +79,7 @@ %prep -%setup -c -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -n %ooo_build_tag-%piece # hack to move sources to a reasonable location mv ooo/*/* . && rm -rf ooo ++++++ OpenOffice_org-help-group1.spec ++++++ --- /var/tmp/diff_new_pack.NZOvTF/_old 2009-12-10 12:43:05.000000000 +0100 +++ /var/tmp/diff_new_pack.NZOvTF/_new 2009-12-10 12:43:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group1 (Version 3.1.99.2) +# spec file for package OpenOffice_org-help-group1 (Version 3.1.99.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-help-group1 -Version: 3.1.99.2 +Version: 3.1.99.4 Release: 1 -%define ooo_build_version 3.1.99.2 +%define ooo_build_version 3.1.99.4 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -58,14 +58,13 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m4 -License: LGPL v3 only +%define ooo_build_tag ooo320-m7 +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 -Source1: ooo-sdf-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-groupX.spec.in Source101: ooo-help-gen-spec @@ -82,7 +81,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-help-ar -License: LGPL v3 only +License: LGPLv3 Summary: Arabic Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ar) @@ -100,7 +99,7 @@ %if %test_build_langs >= 1 %package -n OpenOffice_org-help-cs -License: LGPL v3 only +License: LGPLv3 Summary: Czech Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:cs) @@ -118,7 +117,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-help-da -License: LGPL v3 only +License: LGPLv3 Summary: Danish Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:da) @@ -136,7 +135,7 @@ %if %test_build_langs >= 1 %package -n OpenOffice_org-help-de -License: LGPL v3 only +License: LGPLv3 Summary: German Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:de) @@ -154,7 +153,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-help-en-GB -License: LGPL v3 only +License: LGPLv3 Summary: British Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:en_GB) @@ -170,7 +169,7 @@ %endif %prep -%setup -c -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -n %ooo_build_tag-%piece # hack to move sources to a reasonable location mv ooo/*/* . && rm -rf ooo ++++++ OpenOffice_org-help-group2.spec ++++++ --- /var/tmp/diff_new_pack.NZOvTF/_old 2009-12-10 12:43:05.000000000 +0100 +++ /var/tmp/diff_new_pack.NZOvTF/_new 2009-12-10 12:43:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group2 (Version 3.1.99.2) +# spec file for package OpenOffice_org-help-group2 (Version 3.1.99.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-help-group2 -Version: 3.1.99.2 +Version: 3.1.99.4 Release: 1 -%define ooo_build_version 3.1.99.2 +%define ooo_build_version 3.1.99.4 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -58,14 +58,13 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m4 -License: LGPL v3 only +%define ooo_build_tag ooo320-m7 +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 -Source1: ooo-sdf-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-groupX.spec.in Source101: ooo-help-gen-spec @@ -82,7 +81,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-help-en-ZA -License: LGPL v3 only +License: LGPLv3 Summary: South Africa English Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:en_ZA) @@ -97,7 +96,7 @@ %package -n OpenOffice_org-help-es -License: LGPL v3 only +License: LGPLv3 Summary: Spanish Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:es) @@ -112,7 +111,7 @@ %package -n OpenOffice_org-help-et -License: LGPL v3 only +License: LGPLv3 Summary: Estonian Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:et) @@ -127,7 +126,7 @@ %package -n OpenOffice_org-help-fr -License: LGPL v3 only +License: LGPLv3 Summary: French Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:fr) @@ -142,7 +141,7 @@ %package -n OpenOffice_org-help-gl -License: LGPL v3 only +License: LGPLv3 Summary: Galician Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:gl) @@ -158,7 +157,7 @@ %endif %prep -%setup -c -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -n %ooo_build_tag-%piece # hack to move sources to a reasonable location mv ooo/*/* . && rm -rf ooo ++++++ OpenOffice_org-help-group3.spec ++++++ --- /var/tmp/diff_new_pack.NZOvTF/_old 2009-12-10 12:43:05.000000000 +0100 +++ /var/tmp/diff_new_pack.NZOvTF/_new 2009-12-10 12:43:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group3 (Version 3.1.99.2) +# spec file for package OpenOffice_org-help-group3 (Version 3.1.99.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-help-group3 -Version: 3.1.99.2 +Version: 3.1.99.4 Release: 1 -%define ooo_build_version 3.1.99.2 +%define ooo_build_version 3.1.99.4 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -40,7 +40,7 @@ %if %test_build_langs == 1 %define ooo_langs "hu ja" %else -%define ooo_langs "gu-IN hi-IN hu it ja km" +%define ooo_langs "gu hi-IN hu it ja km" %endif %endif %define ooo_basis_dir basis3.2 @@ -58,14 +58,13 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m4 -License: LGPL v3 only +%define ooo_build_tag ooo320-m7 +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 -Source1: ooo-sdf-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-groupX.spec.in Source101: ooo-help-gen-spec @@ -82,10 +81,10 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-help-gu-IN -License: LGPL v3 only +License: LGPLv3 Summary: Gujarati Help Localization for OpenOffice.org Group: Productivity/Office/Suite -Provides: locale(OpenOffice_org:gu_IN) +Provides: locale(OpenOffice_org:gu) Provides: OpenOffice_org-gu-IN:%_prefix/ooo-2.0/help/cs/default.css PreReq: OpenOffice_org-ure = %version Supplements: OpenOffice_org-l10n-gu-IN @@ -97,7 +96,7 @@ %package -n OpenOffice_org-help-hi-IN -License: LGPL v3 only +License: LGPLv3 Summary: Hindi Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:hi_IN) @@ -115,7 +114,7 @@ %if %test_build_langs >= 1 %package -n OpenOffice_org-help-hu -License: LGPL v3 only +License: LGPLv3 Summary: Hungarian Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:hu) @@ -133,7 +132,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-help-it -License: LGPL v3 only +License: LGPLv3 Summary: Italian Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:it) @@ -151,7 +150,7 @@ %if %test_build_langs >= 1 %package -n OpenOffice_org-help-ja -License: LGPL v3 only +License: LGPLv3 Summary: Japanese Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ja) @@ -169,7 +168,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-help-km -License: LGPL v3 only +License: LGPLv3 Summary: Khmer Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:km) @@ -185,7 +184,7 @@ %endif %prep -%setup -c -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -n %ooo_build_tag-%piece # hack to move sources to a reasonable location mv ooo/*/* . && rm -rf ooo @@ -227,14 +226,14 @@ # gu-IN %posttrans -n OpenOffice_org-help-gu-IN -%_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-help-gu_IN.txt || true +%_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-help-gu.txt || true %preun -n OpenOffice_org-help-gu-IN -test "$1" = "0" && cp %_datadir/%ooo_home/files-help-gu_IN.txt %_datadir/%ooo_home/files-help-gu_IN.txt.postun || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-help-gu.txt %_datadir/%ooo_home/files-help-gu.txt.postun || true %postun -n OpenOffice_org-help-gu-IN -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-help-gu_IN.txt.postun || true -rm -f %_datadir/%ooo_home/files-help-gu_IN.txt.postun 2>/dev/null +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-help-gu.txt.postun || true +rm -f %_datadir/%ooo_home/files-help-gu.txt.postun 2>/dev/null # hi-IN %posttrans -n OpenOffice_org-help-hi-IN @@ -301,7 +300,7 @@ %endif %if %test_build_langs >= 2 -%files -f files-help-gu_IN.txt -n OpenOffice_org-help-gu-IN +%files -f files-help-gu.txt -n OpenOffice_org-help-gu-IN %defattr(-,root,root) %files -f files-help-hi_IN.txt -n OpenOffice_org-help-hi-IN ++++++ OpenOffice_org-help-group4.spec ++++++ --- /var/tmp/diff_new_pack.NZOvTF/_old 2009-12-10 12:43:05.000000000 +0100 +++ /var/tmp/diff_new_pack.NZOvTF/_new 2009-12-10 12:43:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group4 (Version 3.1.99.2) +# spec file for package OpenOffice_org-help-group4 (Version 3.1.99.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-help-group4 -Version: 3.1.99.2 +Version: 3.1.99.4 Release: 1 -%define ooo_build_version 3.1.99.2 +%define ooo_build_version 3.1.99.4 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -58,14 +58,13 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m4 -License: LGPL v3 only +%define ooo_build_tag ooo320-m7 +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 -Source1: ooo-sdf-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-groupX.spec.in Source101: ooo-help-gen-spec @@ -82,7 +81,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-help-ko -License: LGPL v3 only +License: LGPLv3 Summary: Korean Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ko) @@ -97,7 +96,7 @@ %package -n OpenOffice_org-help-nl -License: LGPL v3 only +License: LGPLv3 Summary: Dutch Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:nl) @@ -112,7 +111,7 @@ %package -n OpenOffice_org-help-pa-IN -License: LGPL v3 only +License: LGPLv3 Summary: Punjabi Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:pa_IN) @@ -127,7 +126,7 @@ %package -n OpenOffice_org-help-pl -License: LGPL v3 only +License: LGPLv3 Summary: Polish Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:pl) @@ -142,7 +141,7 @@ %package -n OpenOffice_org-help-pt -License: LGPL v3 only +License: LGPLv3 Summary: Portuguese Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:pt) @@ -158,7 +157,7 @@ %endif %prep -%setup -c -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -n %ooo_build_tag-%piece # hack to move sources to a reasonable location mv ooo/*/* . && rm -rf ooo ++++++ OpenOffice_org-help-group5.spec ++++++ --- /var/tmp/diff_new_pack.NZOvTF/_old 2009-12-10 12:43:05.000000000 +0100 +++ /var/tmp/diff_new_pack.NZOvTF/_new 2009-12-10 12:43:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group5 (Version 3.1.99.2) +# spec file for package OpenOffice_org-help-group5 (Version 3.1.99.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-help-group5 -Version: 3.1.99.2 +Version: 3.1.99.4 Release: 1 -%define ooo_build_version 3.1.99.2 +%define ooo_build_version 3.1.99.4 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -58,14 +58,13 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m4 -License: LGPL v3 only +%define ooo_build_tag ooo320-m7 +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 -Source1: ooo-sdf-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-groupX.spec.in Source101: ooo-help-gen-spec @@ -82,7 +81,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-help-pt-BR -License: LGPL v3 only +License: LGPLv3 Summary: Brazilian Portuguese Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:pt_BR) @@ -97,7 +96,7 @@ %package -n OpenOffice_org-help-ru -License: LGPL v3 only +License: LGPLv3 Summary: Russian Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ru) @@ -112,7 +111,7 @@ %package -n OpenOffice_org-help-sl -License: LGPL v3 only +License: LGPLv3 Summary: Slovene Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:sl) @@ -127,7 +126,7 @@ %package -n OpenOffice_org-help-sv -License: LGPL v3 only +License: LGPLv3 Summary: Swedish Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:sv) @@ -142,7 +141,7 @@ %package -n OpenOffice_org-help-zh-CN -License: LGPL v3 only +License: LGPLv3 Summary: Chinese Simplified Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:zh_CN) @@ -157,7 +156,7 @@ %package -n OpenOffice_org-help-zh-TW -License: LGPL v3 only +License: LGPLv3 Summary: Chinese Traditional Help Localization for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:zh_TW) @@ -173,7 +172,7 @@ %endif %prep -%setup -c -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -n %ooo_build_tag-%piece # hack to move sources to a reasonable location mv ooo/*/* . && rm -rf ooo ++++++ ooo320-m4-help.tar.bz2 -> ooo320-m7-help.tar.bz2 ++++++ ++++ 651927 lines of diff (skipped) ++++++ ooo-help-en-US ++++++ --- /var/tmp/diff_new_pack.NZOvTF/_old 2009-12-10 12:43:12.000000000 +0100 +++ /var/tmp/diff_new_pack.NZOvTF/_new 2009-12-10 12:43:12.000000000 +0100 @@ -1,3 +1,3 @@ -# %lang lang-code lang-name min-build-number spec-group-number +# %lang lang-code[/upstream-lang-code] lang-name min-build-number spec-group-number %lang en-US American 0 0 ++++++ ooo-help-gen-spec ++++++ --- /var/tmp/diff_new_pack.NZOvTF/_old 2009-12-10 12:43:12.000000000 +0100 +++ /var/tmp/diff_new_pack.NZOvTF/_new 2009-12-10 12:43:12.000000000 +0100 @@ -10,12 +10,26 @@ sub init_lang_data($$$$$) { - my ($datap, $curLang, $long_name, $level, $group) = @_; + my ($datap, $lang_code, $long_name, $level, $group) = @_; + + my $curLang; + my $upstreamLang; + # we support the syntax: package_lang_code[/ooo_source_lang_code] + if ($lang_code =~ m/([\w\-]+)\/?([\w\-]+)?/) { + $curLang = "$1"; + if (defined $2) { + $upstreamLang = "$2"; + } else { + $upstreamLang = $curLang; + } + } else { + die "Syntax error: unknown format of the language code: $lang_code, line $."; + } $datap->{'lang'}{$curLang}{'long_name'} = $long_name; $datap->{'lang'}{$curLang}{'level'} = $level; $datap->{'lang'}{$curLang}{'group'} = $group; - $datap->{'lang'}{$curLang}{'locale'} = "$curLang"; + $datap->{'lang'}{$curLang}{'locale'} = $upstreamLang; $datap->{'lang'}{$curLang}{'locale'} =~ s/-/_/g; $datap->{'lang'}{$curLang}{'package-help'} = (); @@ -24,7 +38,7 @@ ($level <= $max_level) || die "Error: Maximum allowed level is $max_level, line $."; foreach my $l ($level .. $max_level) { @ {$datap->{'level_langs_list'}[$l]} = () unless (defined $datap->{'level_langs_list'}[$l]); - push @ {$datap->{'level_langs_list'}[$l]}, $curLang; + push @ {$datap->{'level_langs_list'}[$l]}, $upstreamLang; $l++; } @@ -46,9 +60,12 @@ chomp $line; # ignore comments $line =~ s/#.*$//; - if ( $line =~ m/^\s*\%lang\s+([\w-]+)\s+(\w+)\s+(\d+)\s+(\d+)\s*$/ ) { + if ( $line =~ m/^\s*\%lang\s+([\w\-\/]+)\s+(\w+)\s+(\d+)\s+(\d+)\s*$/ ) { + # long name without without quotation marks, e.g. %lang de German 1 1 + # the language code might be different for the packages for upstream file list, e.g. %lang gu-IN/gu Gujarati 2 3 $curLang = init_lang_data($datap, "$1", "$2", "$3", "$4"); - } elsif ( $line =~ m/^\s*\%lang\s+([\w-]+)\s+\"([\w\s]+)\"\s+(\d+)\s+(\d+)\s*$/ ) { + } elsif ( $line =~ m/^\s*\%lang\s+([\w\-\/]+)\s+\"([\w\s]+)\"\s+(\d+)\s+(\d+)\s*$/ ) { + # long name with with quotation marks, e.g. %lang en-ZA "South Africa English" 2 2 $curLang = init_lang_data($datap, "$1", "$2", "$3", "$4"); } elsif ( $line =~ /^\s*\%poor-help\s*$/ ) { $datap->{'lang'}{$curLang}{'poor-help'} = 1; @@ -182,10 +199,11 @@ foreach my $curLang (sort keys %{$datap->{'lang'}}) { if ( ($group == $datap->{'lang'}{$curLang}{'group'}) && ($level >= $datap->{'lang'}{$curLang}{'level'}) ) { - $level_langs .= " $curLang"; + $level_langs .= " $datap->{'lang'}{$curLang}{'locale'}"; } } $level_langs =~ s/^ //; + $level_langs =~ s/_/-/g; return $level_langs; } @@ -211,8 +229,11 @@ # 'level' ... integer, level in whih it should get build, e.g. '1' # it is the level in the rpm spec to do a reduced build # 'group' ... integer, defines the target spec file; '0' is used for the en-US package -# 'locale' ... string, it is actually the lang id with undersore instead of dash, -# e.g. "en_US" +# 'locale' ... string, it is the code used by the upstream sources; +# it is usually the lang id with undersore instead of dash, +# e.g. "en_US"; ot it might differ from the package lang code if +# upstream renamed it later, for example, "gu-IN" was renamed to +# "gu" in ooo320-m5 # 'poor-help' ... integer, is defined when the help is poor and the help package # is not created # 'package-help' ... array of strings that should be added to the %package section for ++++++ ooo-help-groupX ++++++ --- /var/tmp/diff_new_pack.NZOvTF/_old 2009-12-10 12:43:12.000000000 +0100 +++ /var/tmp/diff_new_pack.NZOvTF/_new 2009-12-10 12:43:12.000000000 +0100 @@ -1,4 +1,4 @@ -# %lang lang-code lang-name min-build-number spec-group-number +# %lang lang-code[/upstream-lang-code] lang-name min-build-number spec-group-number %lang ar Arabic 2 1 @@ -22,7 +22,7 @@ %lang hi-IN Hindi 2 3 -%lang gu-IN Gujarati 2 3 +%lang gu-IN/gu Gujarati 2 3 %lang hu Hungarian 1 3 ++++++ OpenOffice_org-help-en-US.spec.in ++++++ --- /var/tmp/diff_new_pack.NZOvTF/_old 2009-12-10 12:43:12.000000000 +0100 +++ /var/tmp/diff_new_pack.NZOvTF/_new 2009-12-10 12:43:12.000000000 +0100 @@ -20,9 +20,9 @@ @DO_NOT_EDIT_COMMENT@ Name: OpenOffice_org-help-en-US -Version: 3.1.99.2 +Version: 3.1.99.4 Release: 1 -%define ooo_build_version 3.1.99.2 +%define ooo_build_version 3.1.99.4 %define piece help %define ooo_langs "en-US" %define ooo_basis_dir basis3.2 @@ -40,7 +40,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m4 +%define ooo_build_tag ooo320-m7 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on @@ -51,7 +51,6 @@ Summary: American Help Localization for OpenOffice.org Url: http://www.openoffice.org/ Source0: %ooo_build_tag-%piece.tar.bz2 -Source1: ooo-sdf-%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,7 +80,7 @@ %prep -%setup -c -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -n %ooo_build_tag-%piece # hack to move sources to a reasonable location mv ooo/*/* . && rm -rf ooo ++++++ OpenOffice_org-help-groupX.spec.in ++++++ --- /var/tmp/diff_new_pack.NZOvTF/_old 2009-12-10 12:43:12.000000000 +0100 +++ /var/tmp/diff_new_pack.NZOvTF/_new 2009-12-10 12:43:12.000000000 +0100 @@ -20,9 +20,9 @@ @DO_NOT_EDIT_COMMENT@ Name: OpenOffice_org-help-group@GROUP_NUMBER@ -Version: 3.1.99.2 +Version: 3.1.99.4 Release: 1 -%define ooo_build_version 3.1.99.2 +%define ooo_build_version 3.1.99.4 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -59,14 +59,13 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m4 +%define ooo_build_tag ooo320-m7 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on Summary: OpenOffice.org Help Development Url: http://www.openoffice.org/ Source0: %ooo_build_tag-%piece.tar.bz2 -Source1: ooo-sdf-%piece.tar.bz2 # helper stuff to produce pieces of the spec file Source100: OpenOffice_org-help-groupX.spec.in Source101: ooo-help-gen-spec @@ -82,7 +81,7 @@ @SUBPACKAGES_METAINFO@ %prep -%setup -c -q -a1 -n %ooo_build_tag-%piece +%setup -c -q -n %ooo_build_tag-%piece # hack to move sources to a reasonable location mv ooo/*/* . && rm -rf ooo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org