Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at Mon Sep 26 10:08:47 CEST 2011.
-------- libreoffice-help-en-US.changes: same change libreoffice-help-group1.changes: same change libreoffice-help-group2.changes: same change libreoffice-help-group3.changes: same change libreoffice-help-group4.changes: same change libreoffice-help-group5.changes: same change --- libreoffice/libreoffice.changes 2011-09-15 12:19:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/libreoffice/libreoffice.changes 2011-09-23 13:44:32.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 22 18:33:02 UTC 2011 - [email protected] + +- Fix build with poppler 0.17.0 +- Add python-lxml dependency for faster translation processing + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libreoffice-poppler-0.17.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-branding-upstream.spec ++++++ --- /var/tmp/diff_new_pack.FQdRej/_old 2011-09-26 10:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.FQdRej/_new 2011-09-26 10:08:25.000000000 +0200 @@ -75,7 +75,6 @@ #BRAND: type: text config file (ini-files-like) #BRAND: purpose: defines the position, size and, color of the status bar - %description This package includes the original branding for the LibreOffice office suite. @@ -85,10 +84,8 @@ %prep %setup -q -n libreoffice-artwork-%version - %build - %install install -m 755 -d $RPM_BUILD_ROOT%_datadir/%lo_home/program/shell # sofficerc @@ -106,15 +103,11 @@ $RPM_BUILD_ROOT%_datadir/%lo_home/program/$pict done - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %_datadir/%lo_home - - %changelog ++++++ libreoffice-help-en-US.spec ++++++ --- /var/tmp/diff_new_pack.FQdRej/_old 2011-09-26 10:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.FQdRej/_new 2011-09-26 10:08:25.000000000 +0200 @@ -100,7 +100,6 @@ #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch - %description American help localization for LibreOffice. The other localized stuff is in LibreOffice-l10n-en-US. @@ -121,7 +120,6 @@ %patch1 %endif - %build %if %prepare_build != 0 # @@ -210,7 +208,6 @@ cd helpcontent2 build --all $PARALLEL_BUILD - %install . ./*Env.Set.sh test -z "%lo_langs" && langs="en-US" || langs="%lo_langs" @@ -233,7 +230,6 @@ echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist done - %clean rm -rf $RPM_BUILD_ROOT @@ -242,19 +238,14 @@ %posttrans -n libreoffice-help-en-US %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_en_US_list.txt || true - %preun -n libreoffice-help-en-US test "$1" = "0" && cp %_datadir/%lo_home/help_en_US_list.txt %_datadir/%lo_home/help_en_US_list.txt.postun || true - %postun -n libreoffice-help-en-US test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_en_US_list.txt.postun || true rm -f %_datadir/%lo_home/help_en_US_list.txt.postun 2>/dev/null - %files -f file-lists/help_en_US_list.txt -n libreoffice-help-en-US %defattr(-,root,root) - - %changelog ++++++ libreoffice-help-group1.spec ++++++ --- /var/tmp/diff_new_pack.FQdRej/_old 2011-09-26 10:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.FQdRej/_new 2011-09-26 10:08:25.000000000 +0200 @@ -99,7 +99,6 @@ #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch - %description This package provides files related to the LibreOffice help development. @@ -107,7 +106,6 @@ %if %test_build_langs >= 1 - %package -n libreoffice-help-cs License: LGPLv3 Summary: Czech Help Localization for LibreOffice @@ -122,7 +120,6 @@ Obsoletes: OpenOffice_org-help-cs <= %version Provides: OpenOffice_org-cs:%_prefix/ooo-2.0/help/cs/default.css - %description -n libreoffice-help-cs Czech help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-cs. @@ -132,7 +129,6 @@ %endif %if %test_build_langs >= 2 - %package -n libreoffice-help-da License: LGPLv3 Summary: Danish Help Localization for LibreOffice @@ -147,7 +143,6 @@ Obsoletes: OpenOffice_org-help-da <= %version Provides: OpenOffice_org-da:%_prefix/ooo-2.0/help/da/default.css - %description -n libreoffice-help-da Danish help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-da. @@ -157,7 +152,6 @@ %endif %if %test_build_langs >= 1 - %package -n libreoffice-help-de License: LGPLv3 Summary: German Help Localization for LibreOffice @@ -172,7 +166,6 @@ Obsoletes: OpenOffice_org-help-de <= %version Provides: OpenOffice_org-de:%_prefix/ooo-2.0/help/de/default.css - %description -n libreoffice-help-de German help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-de. @@ -182,7 +175,6 @@ %endif %if %test_build_langs >= 2 - %package -n libreoffice-help-en-GB License: LGPLv3 Summary: British Help Localization for LibreOffice @@ -197,7 +189,6 @@ Obsoletes: OpenOffice_org-help-en-GB <= %version Provides: OpenOffice_org-en-GB:%_prefix/ooo-2.0/help/en-GB/default.css - %description -n libreoffice-help-en-GB British help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-en-GB. @@ -205,7 +196,6 @@ %endif - %prep %if %prepare_build == 0 %setup -D -T -q -n libreoffice-bootstrap-%version @@ -222,7 +212,6 @@ %patch2 %endif - %build %if %prepare_build != 0 # @@ -311,7 +300,6 @@ cd helpcontent2 build --all $PARALLEL_BUILD - %install . ./*Env.Set.sh test -z %lo_langs && langs="en-US" || langs=%lo_langs @@ -334,7 +322,6 @@ echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist done - %clean rm -rf $RPM_BUILD_ROOT @@ -344,11 +331,9 @@ %posttrans -n libreoffice-help-cs %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_cs_list.txt || true - %preun -n libreoffice-help-cs test "$1" = "0" && cp %_datadir/%lo_home/help_cs_list.txt %_datadir/%lo_home/help_cs_list.txt.postun || true - %postun -n libreoffice-help-cs test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_cs_list.txt.postun || true rm -f %_datadir/%lo_home/help_cs_list.txt.postun 2>/dev/null @@ -360,11 +345,9 @@ %posttrans -n libreoffice-help-da %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_da_list.txt || true - %preun -n libreoffice-help-da test "$1" = "0" && cp %_datadir/%lo_home/help_da_list.txt %_datadir/%lo_home/help_da_list.txt.postun || true - %postun -n libreoffice-help-da test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_da_list.txt.postun || true rm -f %_datadir/%lo_home/help_da_list.txt.postun 2>/dev/null @@ -376,11 +359,9 @@ %posttrans -n libreoffice-help-de %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_de_list.txt || true - %preun -n libreoffice-help-de test "$1" = "0" && cp %_datadir/%lo_home/help_de_list.txt %_datadir/%lo_home/help_de_list.txt.postun || true - %postun -n libreoffice-help-de test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_de_list.txt.postun || true rm -f %_datadir/%lo_home/help_de_list.txt.postun 2>/dev/null @@ -392,11 +373,9 @@ %posttrans -n libreoffice-help-en-GB %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_en_GB_list.txt || true - %preun -n libreoffice-help-en-GB test "$1" = "0" && cp %_datadir/%lo_home/help_en_GB_list.txt %_datadir/%lo_home/help_en_GB_list.txt.postun || true - %postun -n libreoffice-help-en-GB test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_en_GB_list.txt.postun || true rm -f %_datadir/%lo_home/help_en_GB_list.txt.postun 2>/dev/null @@ -404,32 +383,26 @@ %if %test_build_langs >= 1 - %files -f file-lists/help_cs_list.txt -n libreoffice-help-cs %defattr(-,root,root) %endif %if %test_build_langs >= 2 - %files -f file-lists/help_da_list.txt -n libreoffice-help-da %defattr(-,root,root) %endif %if %test_build_langs >= 1 - %files -f file-lists/help_de_list.txt -n libreoffice-help-de %defattr(-,root,root) %endif %if %test_build_langs >= 2 - %files -f file-lists/help_en_GB_list.txt -n libreoffice-help-en-GB %defattr(-,root,root) %endif - - %changelog ++++++ libreoffice-help-group2.spec ++++++ --- /var/tmp/diff_new_pack.FQdRej/_old 2011-09-26 10:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.FQdRej/_new 2011-09-26 10:08:25.000000000 +0200 @@ -99,7 +99,6 @@ #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch - %description This package provides files related to the LibreOffice help development. @@ -107,7 +106,6 @@ %if %test_build_langs >= 2 - %package -n libreoffice-help-en-ZA License: LGPLv3 Summary: South Africa English Help Localization for LibreOffice @@ -122,7 +120,6 @@ Obsoletes: OpenOffice_org-help-en-ZA <= %version Provides: OpenOffice_org-en-ZA:%_prefix/ooo-2.0/help/en-ZA/default.css - %description -n libreoffice-help-en-ZA South Africa English help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-en-ZA. @@ -143,7 +140,6 @@ Obsoletes: OpenOffice_org-help-es <= %version Provides: OpenOffice_org-es:%_prefix/ooo-2.0/help/es/default.css - %description -n libreoffice-help-es Spanish help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-es. @@ -164,7 +160,6 @@ Obsoletes: OpenOffice_org-help-et <= %version Provides: OpenOffice_org-et:%_prefix/ooo-2.0/help/et/default.css - %description -n libreoffice-help-et Estonian help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-et. @@ -185,7 +180,6 @@ Obsoletes: OpenOffice_org-help-fr <= %version Provides: OpenOffice_org-fr:%_prefix/ooo-2.0/help/fr/default.css - %description -n libreoffice-help-fr French help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-fr. @@ -206,7 +200,6 @@ Obsoletes: OpenOffice_org-help-gl <= %version Provides: OpenOffice_org-gl:%_prefix/ooo-2.0/help/gl/default.css - %description -n libreoffice-help-gl Galician help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-gl. @@ -214,7 +207,6 @@ %endif - %prep %if %prepare_build == 0 %setup -D -T -q -n libreoffice-bootstrap-%version @@ -231,7 +223,6 @@ %patch2 %endif - %build %if %prepare_build != 0 # @@ -320,7 +311,6 @@ cd helpcontent2 build --all $PARALLEL_BUILD - %install . ./*Env.Set.sh test -z %lo_langs && langs="en-US" || langs=%lo_langs @@ -343,7 +333,6 @@ echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist done - %clean rm -rf $RPM_BUILD_ROOT @@ -353,11 +342,9 @@ %posttrans -n libreoffice-help-en-ZA %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_en_ZA_list.txt || true - %preun -n libreoffice-help-en-ZA test "$1" = "0" && cp %_datadir/%lo_home/help_en_ZA_list.txt %_datadir/%lo_home/help_en_ZA_list.txt.postun || true - %postun -n libreoffice-help-en-ZA test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_en_ZA_list.txt.postun || true rm -f %_datadir/%lo_home/help_en_ZA_list.txt.postun 2>/dev/null @@ -366,11 +353,9 @@ %posttrans -n libreoffice-help-es %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_es_list.txt || true - %preun -n libreoffice-help-es test "$1" = "0" && cp %_datadir/%lo_home/help_es_list.txt %_datadir/%lo_home/help_es_list.txt.postun || true - %postun -n libreoffice-help-es test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_es_list.txt.postun || true rm -f %_datadir/%lo_home/help_es_list.txt.postun 2>/dev/null @@ -379,11 +364,9 @@ %posttrans -n libreoffice-help-et %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_et_list.txt || true - %preun -n libreoffice-help-et test "$1" = "0" && cp %_datadir/%lo_home/help_et_list.txt %_datadir/%lo_home/help_et_list.txt.postun || true - %postun -n libreoffice-help-et test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_et_list.txt.postun || true rm -f %_datadir/%lo_home/help_et_list.txt.postun 2>/dev/null @@ -392,11 +375,9 @@ %posttrans -n libreoffice-help-fr %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_fr_list.txt || true - %preun -n libreoffice-help-fr test "$1" = "0" && cp %_datadir/%lo_home/help_fr_list.txt %_datadir/%lo_home/help_fr_list.txt.postun || true - %postun -n libreoffice-help-fr test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_fr_list.txt.postun || true rm -f %_datadir/%lo_home/help_fr_list.txt.postun 2>/dev/null @@ -405,11 +386,9 @@ %posttrans -n libreoffice-help-gl %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_gl_list.txt || true - %preun -n libreoffice-help-gl test "$1" = "0" && cp %_datadir/%lo_home/help_gl_list.txt %_datadir/%lo_home/help_gl_list.txt.postun || true - %postun -n libreoffice-help-gl test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_gl_list.txt.postun || true rm -f %_datadir/%lo_home/help_gl_list.txt.postun 2>/dev/null @@ -417,27 +396,20 @@ %if %test_build_langs >= 2 - %files -f file-lists/help_en_ZA_list.txt -n libreoffice-help-en-ZA %defattr(-,root,root) - %files -f file-lists/help_es_list.txt -n libreoffice-help-es %defattr(-,root,root) - %files -f file-lists/help_et_list.txt -n libreoffice-help-et %defattr(-,root,root) - %files -f file-lists/help_fr_list.txt -n libreoffice-help-fr %defattr(-,root,root) - %files -f file-lists/help_gl_list.txt -n libreoffice-help-gl %defattr(-,root,root) %endif - - %changelog ++++++ libreoffice-help-group3.spec ++++++ --- /var/tmp/diff_new_pack.FQdRej/_old 2011-09-26 10:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.FQdRej/_new 2011-09-26 10:08:25.000000000 +0200 @@ -99,7 +99,6 @@ #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch - %description This package provides files related to the LibreOffice help development. @@ -107,7 +106,6 @@ %if %test_build_langs >= 2 - %package -n libreoffice-help-gu-IN License: LGPLv3 Summary: Gujarati Help Localization for LibreOffice @@ -122,7 +120,6 @@ Obsoletes: OpenOffice_org-help-gu-IN <= %version Provides: OpenOffice_org-gu-IN:%_prefix/ooo-2.0/help/gu-IN/default.css - %description -n libreoffice-help-gu-IN Gujarati help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-gu-IN. @@ -143,7 +140,6 @@ Obsoletes: OpenOffice_org-help-hi-IN <= %version Provides: OpenOffice_org-hi-IN:%_prefix/ooo-2.0/help/hi-IN/default.css - %description -n libreoffice-help-hi-IN Hindi help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-hi-IN. @@ -153,7 +149,6 @@ %endif %if %test_build_langs >= 1 - %package -n libreoffice-help-hu License: LGPLv3 Summary: Hungarian Help Localization for LibreOffice @@ -168,7 +163,6 @@ Obsoletes: OpenOffice_org-help-hu <= %version Provides: OpenOffice_org-hu:%_prefix/ooo-2.0/help/hu/default.css - %description -n libreoffice-help-hu Hungarian help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-hu. @@ -178,7 +172,6 @@ %endif %if %test_build_langs >= 2 - %package -n libreoffice-help-it License: LGPLv3 Summary: Italian Help Localization for LibreOffice @@ -193,7 +186,6 @@ Obsoletes: OpenOffice_org-help-it <= %version Provides: OpenOffice_org-it:%_prefix/ooo-2.0/help/it/default.css - %description -n libreoffice-help-it Italian help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-it. @@ -203,7 +195,6 @@ %endif %if %test_build_langs >= 1 - %package -n libreoffice-help-ja License: LGPLv3 Summary: Japanese Help Localization for LibreOffice @@ -218,7 +209,6 @@ Obsoletes: OpenOffice_org-help-ja <= %version Provides: OpenOffice_org-ja:%_prefix/ooo-2.0/help/ja/default.css - %description -n libreoffice-help-ja Japanese help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-ja. @@ -228,7 +218,6 @@ %endif %if %test_build_langs >= 2 - %package -n libreoffice-help-km License: LGPLv3 Summary: Khmer Help Localization for LibreOffice @@ -243,7 +232,6 @@ Obsoletes: OpenOffice_org-help-km <= %version Provides: OpenOffice_org-km:%_prefix/ooo-2.0/help/km/default.css - %description -n libreoffice-help-km Khmer help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-km. @@ -251,7 +239,6 @@ %endif - %prep %if %prepare_build == 0 %setup -D -T -q -n libreoffice-bootstrap-%version @@ -268,7 +255,6 @@ %patch2 %endif - %build %if %prepare_build != 0 # @@ -357,7 +343,6 @@ cd helpcontent2 build --all $PARALLEL_BUILD - %install . ./*Env.Set.sh test -z %lo_langs && langs="en-US" || langs=%lo_langs @@ -380,7 +365,6 @@ echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist done - %clean rm -rf $RPM_BUILD_ROOT @@ -390,11 +374,9 @@ %posttrans -n libreoffice-help-gu-IN %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_gu_list.txt || true - %preun -n libreoffice-help-gu-IN test "$1" = "0" && cp %_datadir/%lo_home/help_gu_list.txt %_datadir/%lo_home/help_gu_list.txt.postun || true - %postun -n libreoffice-help-gu-IN test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_gu_list.txt.postun || true rm -f %_datadir/%lo_home/help_gu_list.txt.postun 2>/dev/null @@ -403,11 +385,9 @@ %posttrans -n libreoffice-help-hi-IN %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_hi_list.txt || true - %preun -n libreoffice-help-hi-IN test "$1" = "0" && cp %_datadir/%lo_home/help_hi_list.txt %_datadir/%lo_home/help_hi_list.txt.postun || true - %postun -n libreoffice-help-hi-IN test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_hi_list.txt.postun || true rm -f %_datadir/%lo_home/help_hi_list.txt.postun 2>/dev/null @@ -419,11 +399,9 @@ %posttrans -n libreoffice-help-hu %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_hu_list.txt || true - %preun -n libreoffice-help-hu test "$1" = "0" && cp %_datadir/%lo_home/help_hu_list.txt %_datadir/%lo_home/help_hu_list.txt.postun || true - %postun -n libreoffice-help-hu test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_hu_list.txt.postun || true rm -f %_datadir/%lo_home/help_hu_list.txt.postun 2>/dev/null @@ -435,11 +413,9 @@ %posttrans -n libreoffice-help-it %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_it_list.txt || true - %preun -n libreoffice-help-it test "$1" = "0" && cp %_datadir/%lo_home/help_it_list.txt %_datadir/%lo_home/help_it_list.txt.postun || true - %postun -n libreoffice-help-it test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_it_list.txt.postun || true rm -f %_datadir/%lo_home/help_it_list.txt.postun 2>/dev/null @@ -451,11 +427,9 @@ %posttrans -n libreoffice-help-ja %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_ja_list.txt || true - %preun -n libreoffice-help-ja test "$1" = "0" && cp %_datadir/%lo_home/help_ja_list.txt %_datadir/%lo_home/help_ja_list.txt.postun || true - %postun -n libreoffice-help-ja test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_ja_list.txt.postun || true rm -f %_datadir/%lo_home/help_ja_list.txt.postun 2>/dev/null @@ -467,11 +441,9 @@ %posttrans -n libreoffice-help-km %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_km_list.txt || true - %preun -n libreoffice-help-km test "$1" = "0" && cp %_datadir/%lo_home/help_km_list.txt %_datadir/%lo_home/help_km_list.txt.postun || true - %postun -n libreoffice-help-km test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_km_list.txt.postun || true rm -f %_datadir/%lo_home/help_km_list.txt.postun 2>/dev/null @@ -479,43 +451,35 @@ %if %test_build_langs >= 2 - %files -f file-lists/help_gu_list.txt -n libreoffice-help-gu-IN %defattr(-,root,root) - %files -f file-lists/help_hi_list.txt -n libreoffice-help-hi-IN %defattr(-,root,root) %endif %if %test_build_langs >= 1 - %files -f file-lists/help_hu_list.txt -n libreoffice-help-hu %defattr(-,root,root) %endif %if %test_build_langs >= 2 - %files -f file-lists/help_it_list.txt -n libreoffice-help-it %defattr(-,root,root) %endif %if %test_build_langs >= 1 - %files -f file-lists/help_ja_list.txt -n libreoffice-help-ja %defattr(-,root,root) %endif %if %test_build_langs >= 2 - %files -f file-lists/help_km_list.txt -n libreoffice-help-km %defattr(-,root,root) %endif - - %changelog ++++++ libreoffice-help-group4.spec ++++++ --- /var/tmp/diff_new_pack.FQdRej/_old 2011-09-26 10:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.FQdRej/_new 2011-09-26 10:08:25.000000000 +0200 @@ -99,7 +99,6 @@ #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch - %description This package provides files related to the LibreOffice help development. @@ -107,7 +106,6 @@ %if %test_build_langs >= 2 - %package -n libreoffice-help-ko License: LGPLv3 Summary: Korean Help Localization for LibreOffice @@ -122,7 +120,6 @@ Obsoletes: OpenOffice_org-help-ko <= %version Provides: OpenOffice_org-ko:%_prefix/ooo-2.0/help/ko/default.css - %description -n libreoffice-help-ko Korean help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-ko. @@ -143,7 +140,6 @@ Obsoletes: OpenOffice_org-help-nl <= %version Provides: OpenOffice_org-nl:%_prefix/ooo-2.0/help/nl/default.css - %description -n libreoffice-help-nl Dutch help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-nl. @@ -164,7 +160,6 @@ Obsoletes: OpenOffice_org-help-pl <= %version Provides: OpenOffice_org-pl:%_prefix/ooo-2.0/help/pl/default.css - %description -n libreoffice-help-pl Polish help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-pl. @@ -185,7 +180,6 @@ Obsoletes: OpenOffice_org-help-pt <= %version Provides: OpenOffice_org-pt:%_prefix/ooo-2.0/help/pt/default.css - %description -n libreoffice-help-pt Portuguese help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-pt. @@ -193,7 +187,6 @@ %endif - %prep %if %prepare_build == 0 %setup -D -T -q -n libreoffice-bootstrap-%version @@ -210,7 +203,6 @@ %patch2 %endif - %build %if %prepare_build != 0 # @@ -299,7 +291,6 @@ cd helpcontent2 build --all $PARALLEL_BUILD - %install . ./*Env.Set.sh test -z %lo_langs && langs="en-US" || langs=%lo_langs @@ -322,7 +313,6 @@ echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist done - %clean rm -rf $RPM_BUILD_ROOT @@ -332,11 +322,9 @@ %posttrans -n libreoffice-help-ko %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_ko_list.txt || true - %preun -n libreoffice-help-ko test "$1" = "0" && cp %_datadir/%lo_home/help_ko_list.txt %_datadir/%lo_home/help_ko_list.txt.postun || true - %postun -n libreoffice-help-ko test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_ko_list.txt.postun || true rm -f %_datadir/%lo_home/help_ko_list.txt.postun 2>/dev/null @@ -345,11 +333,9 @@ %posttrans -n libreoffice-help-nl %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_nl_list.txt || true - %preun -n libreoffice-help-nl test "$1" = "0" && cp %_datadir/%lo_home/help_nl_list.txt %_datadir/%lo_home/help_nl_list.txt.postun || true - %postun -n libreoffice-help-nl test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_nl_list.txt.postun || true rm -f %_datadir/%lo_home/help_nl_list.txt.postun 2>/dev/null @@ -358,11 +344,9 @@ %posttrans -n libreoffice-help-pl %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_pl_list.txt || true - %preun -n libreoffice-help-pl test "$1" = "0" && cp %_datadir/%lo_home/help_pl_list.txt %_datadir/%lo_home/help_pl_list.txt.postun || true - %postun -n libreoffice-help-pl test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_pl_list.txt.postun || true rm -f %_datadir/%lo_home/help_pl_list.txt.postun 2>/dev/null @@ -371,11 +355,9 @@ %posttrans -n libreoffice-help-pt %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_pt_list.txt || true - %preun -n libreoffice-help-pt test "$1" = "0" && cp %_datadir/%lo_home/help_pt_list.txt %_datadir/%lo_home/help_pt_list.txt.postun || true - %postun -n libreoffice-help-pt test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_pt_list.txt.postun || true rm -f %_datadir/%lo_home/help_pt_list.txt.postun 2>/dev/null @@ -383,23 +365,17 @@ %if %test_build_langs >= 2 - %files -f file-lists/help_ko_list.txt -n libreoffice-help-ko %defattr(-,root,root) - %files -f file-lists/help_nl_list.txt -n libreoffice-help-nl %defattr(-,root,root) - %files -f file-lists/help_pl_list.txt -n libreoffice-help-pl %defattr(-,root,root) - %files -f file-lists/help_pt_list.txt -n libreoffice-help-pt %defattr(-,root,root) %endif - - %changelog ++++++ libreoffice-help-group5.spec ++++++ --- /var/tmp/diff_new_pack.FQdRej/_old 2011-09-26 10:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.FQdRej/_new 2011-09-26 10:08:25.000000000 +0200 @@ -99,7 +99,6 @@ #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch - %description This package provides files related to the LibreOffice help development. @@ -107,7 +106,6 @@ %if %test_build_langs >= 2 - %package -n libreoffice-help-pt-BR License: LGPLv3 Summary: Brazilian Portuguese Help Localization for LibreOffice @@ -122,7 +120,6 @@ Obsoletes: OpenOffice_org-help-pt-BR <= %version Provides: OpenOffice_org-pt-BR:%_prefix/ooo-2.0/help/pt-BR/default.css - %description -n libreoffice-help-pt-BR Brazilian Portuguese help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-pt-BR. @@ -143,7 +140,6 @@ Obsoletes: OpenOffice_org-help-ru <= %version Provides: OpenOffice_org-ru:%_prefix/ooo-2.0/help/ru/default.css - %description -n libreoffice-help-ru Russian help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-ru. @@ -164,7 +160,6 @@ Obsoletes: OpenOffice_org-help-sl <= %version Provides: OpenOffice_org-sl:%_prefix/ooo-2.0/help/sl/default.css - %description -n libreoffice-help-sl Slovene help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-sl. @@ -185,7 +180,6 @@ Obsoletes: OpenOffice_org-help-sv <= %version Provides: OpenOffice_org-sv:%_prefix/ooo-2.0/help/sv/default.css - %description -n libreoffice-help-sv Swedish help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-sv. @@ -206,7 +200,6 @@ Obsoletes: OpenOffice_org-help-zh-CN <= %version Provides: OpenOffice_org-zh-CN:%_prefix/ooo-2.0/help/zh-CN/default.css - %description -n libreoffice-help-zh-CN Chinese Simplified help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-zh-CN. @@ -227,7 +220,6 @@ Obsoletes: OpenOffice_org-help-zh-TW <= %version Provides: OpenOffice_org-zh-TW:%_prefix/ooo-2.0/help/zh-TW/default.css - %description -n libreoffice-help-zh-TW Chinese Traditional help localization for LibreOffice. The other localized stuff is in libreoffice-l10n-zh-TW. @@ -235,7 +227,6 @@ %endif - %prep %if %prepare_build == 0 %setup -D -T -q -n libreoffice-bootstrap-%version @@ -252,7 +243,6 @@ %patch2 %endif - %build %if %prepare_build != 0 # @@ -341,7 +331,6 @@ cd helpcontent2 build --all $PARALLEL_BUILD - %install . ./*Env.Set.sh test -z %lo_langs && langs="en-US" || langs=%lo_langs @@ -364,7 +353,6 @@ echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist done - %clean rm -rf $RPM_BUILD_ROOT @@ -374,11 +362,9 @@ %posttrans -n libreoffice-help-pt-BR %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_pt_BR_list.txt || true - %preun -n libreoffice-help-pt-BR test "$1" = "0" && cp %_datadir/%lo_home/help_pt_BR_list.txt %_datadir/%lo_home/help_pt_BR_list.txt.postun || true - %postun -n libreoffice-help-pt-BR test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_pt_BR_list.txt.postun || true rm -f %_datadir/%lo_home/help_pt_BR_list.txt.postun 2>/dev/null @@ -387,11 +373,9 @@ %posttrans -n libreoffice-help-ru %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_ru_list.txt || true - %preun -n libreoffice-help-ru test "$1" = "0" && cp %_datadir/%lo_home/help_ru_list.txt %_datadir/%lo_home/help_ru_list.txt.postun || true - %postun -n libreoffice-help-ru test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_ru_list.txt.postun || true rm -f %_datadir/%lo_home/help_ru_list.txt.postun 2>/dev/null @@ -400,11 +384,9 @@ %posttrans -n libreoffice-help-sl %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_sl_list.txt || true - %preun -n libreoffice-help-sl test "$1" = "0" && cp %_datadir/%lo_home/help_sl_list.txt %_datadir/%lo_home/help_sl_list.txt.postun || true - %postun -n libreoffice-help-sl test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_sl_list.txt.postun || true rm -f %_datadir/%lo_home/help_sl_list.txt.postun 2>/dev/null @@ -413,11 +395,9 @@ %posttrans -n libreoffice-help-sv %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_sv_list.txt || true - %preun -n libreoffice-help-sv test "$1" = "0" && cp %_datadir/%lo_home/help_sv_list.txt %_datadir/%lo_home/help_sv_list.txt.postun || true - %postun -n libreoffice-help-sv test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_sv_list.txt.postun || true rm -f %_datadir/%lo_home/help_sv_list.txt.postun 2>/dev/null @@ -426,11 +406,9 @@ %posttrans -n libreoffice-help-zh-CN %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_zh_CN_list.txt || true - %preun -n libreoffice-help-zh-CN test "$1" = "0" && cp %_datadir/%lo_home/help_zh_CN_list.txt %_datadir/%lo_home/help_zh_CN_list.txt.postun || true - %postun -n libreoffice-help-zh-CN test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_zh_CN_list.txt.postun || true rm -f %_datadir/%lo_home/help_zh_CN_list.txt.postun 2>/dev/null @@ -439,11 +417,9 @@ %posttrans -n libreoffice-help-zh-TW %_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_zh_TW_list.txt || true - %preun -n libreoffice-help-zh-TW test "$1" = "0" && cp %_datadir/%lo_home/help_zh_TW_list.txt %_datadir/%lo_home/help_zh_TW_list.txt.postun || true - %postun -n libreoffice-help-zh-TW test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_zh_TW_list.txt.postun || true rm -f %_datadir/%lo_home/help_zh_TW_list.txt.postun 2>/dev/null @@ -451,31 +427,23 @@ %if %test_build_langs >= 2 - %files -f file-lists/help_pt_BR_list.txt -n libreoffice-help-pt-BR %defattr(-,root,root) - %files -f file-lists/help_ru_list.txt -n libreoffice-help-ru %defattr(-,root,root) - %files -f file-lists/help_sl_list.txt -n libreoffice-help-sl %defattr(-,root,root) - %files -f file-lists/help_sv_list.txt -n libreoffice-help-sv %defattr(-,root,root) - %files -f file-lists/help_zh_CN_list.txt -n libreoffice-help-zh-CN %defattr(-,root,root) - %files -f file-lists/help_zh_TW_list.txt -n libreoffice-help-zh-TW %defattr(-,root,root) %endif - - %changelog ++++++ libreoffice.spec ++++++ ++++ 713 lines (skipped) ++++ between libreoffice/libreoffice.spec ++++ and /mounts/work_src_done/STABLE/libreoffice/libreoffice.spec ++++++ libreoffice-poppler-0.17.0.patch ++++++ diff -ur libreoffice-extensions-3.4.2.6/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx libreoffice-extensions-3.4.2.6.fixed/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx --- libreoffice-extensions-3.4.2.6/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-05-19 11:14:21.000000000 +0200 +++ libreoffice-extensions-3.4.2.6.fixed/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-09-23 13:41:51.448872095 +0200 @@ -150,7 +150,11 @@ void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed ) { // dump JPEG file as-is +#if POPPLER_CHECK_VERSION(0, 17, 3) + str = str->getBaseStream(); +#else str = ((DCTStream *)str)->getRawStream(); +#endif str->reset(); int c; @@ -489,7 +493,11 @@ printf("endPage\n"); } +#if POPPLER_CHECK_VERSION(0, 17, 0) +void PDFOutDev::processLink(AnnotLink *link, Catalog *) +#else void PDFOutDev::processLink(Link* link, Catalog*) +#endif { assert(link); diff -ur libreoffice-extensions-3.4.2.6/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx libreoffice-extensions-3.4.2.6.fixed/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx --- libreoffice-extensions-3.4.2.6/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-05-19 11:14:21.000000000 +0200 +++ libreoffice-extensions-3.4.2.6.fixed/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-09-23 13:42:48.346872091 +0200 @@ -65,7 +65,14 @@ class GfxFont; class PDFDoc; #ifndef SYSTEM_POPPLER +#define POPPLER_CHECK_VERSION(major,minor,micro) (0) typedef GString GooString; +#else +#include <cpp/poppler-version.h> +#define POPPLER_CHECK_VERSION(major,minor,micro) \ + (POPPLER_VERSION_MAJOR > (major) || \ + (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \ + (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR == (minor) && POPPLER_VERSION_MICRO >= (micro))) #endif namespace pdfi @@ -194,8 +201,12 @@ // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy); // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); + #if POPPLER_CHECK_VERSION(0, 17, 0) + virtual void processLink(AnnotLink *link, Catalog *catalog); + #else //----- link borders virtual void processLink(Link *link, Catalog *catalog); + #endif //----- save/restore graphics state virtual void saveState(GfxState *state); Only in libreoffice-extensions-3.4.2.6.fixed/sdext/source/pdfimport/xpdfwrapper: pdfioutdev_gpl.hxx.orig Only in libreoffice-extensions-3.4.2.6.fixed/sdext/source/pdfimport/xpdfwrapper: pdfioutdev_gpl.hxx.rej ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
