From e155d8472583a5e6e3c1d8d9c5c95ff958fc3a0f2aa2228201006addf61a0b50 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Tue, 11 Oct 2011 15:58:40 +0000 Subject: [PATCH] Accepting request 87378 from LibreOffice:Unstable - add more detailed categories to desktop files - svx-globlmn-hrc-build-dep.diff: fix build dependency problem in svx - apply libreoffice-poppler-0.17.0.patch only on openSUSE > 11.3; cpp/poppler-version.h is not included in older poppler packages - desktop-null-display-crash.diff: fix crash on exit. OBS-URL: https://build.opensuse.org/request/show/87378 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=23 --- desktop-null-display-crash.diff | 22 +++++ libreoffice-branding-upstream.spec | 7 ++ libreoffice-help-en-US.spec | 10 +++ libreoffice-help-group1.spec | 31 +++++++ libreoffice-help-group2.spec | 33 +++++++ libreoffice-help-group3.spec | 42 +++++++++ libreoffice-help-group4.spec | 28 ++++++ libreoffice-help-group5.spec | 38 ++++++++ libreoffice.changes | 17 ++++ libreoffice.spec | 138 ++++++++++++++++++++++++++++- svx-globlmn-hrc-build-dep.diff | 18 ++++ 11 files changed, 383 insertions(+), 1 deletion(-) create mode 100644 desktop-null-display-crash.diff create mode 100644 svx-globlmn-hrc-build-dep.diff diff --git a/desktop-null-display-crash.diff b/desktop-null-display-crash.diff new file mode 100644 index 0000000..ebd7177 --- /dev/null +++ b/desktop-null-display-crash.diff @@ -0,0 +1,22 @@ +--- desktop/unx/source/splashx.c ++++ desktop/unx/source/splashx.c +@@ -612,6 +612,9 @@ + // Draw the progress + void splash_draw_progress( int progress ) + { ++ if (!display) ++ return; ++ + // sanity + if ( progress < 0 ) + progress = 0; +@@ -642,7 +645,8 @@ + // Close the window & cleanup + void splash_close_window() + { +- XCloseDisplay( display ); ++ if (display) ++ XCloseDisplay( display ); + display = NULL; + #ifdef USE_LIBPNG + png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); diff --git a/libreoffice-branding-upstream.spec b/libreoffice-branding-upstream.spec index 6aee630..20787fa 100644 --- a/libreoffice-branding-upstream.spec +++ b/libreoffice-branding-upstream.spec @@ -75,6 +75,7 @@ BuildArch: noarch #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. @@ -84,8 +85,10 @@ office suite. %prep %setup -q -n libreoffice-artwork-%version + %build + %install install -m 755 -d $RPM_BUILD_ROOT%_datadir/%lo_home/program/shell # sofficerc @@ -103,11 +106,15 @@ for pict in about.png \ $RPM_BUILD_ROOT%_datadir/%lo_home/program/$pict done + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root) %_datadir/%lo_home + + %changelog diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec index 82ddefb..95195b0 100644 --- a/libreoffice-help-en-US.spec +++ b/libreoffice-help-en-US.spec @@ -100,6 +100,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch + %description American help localization for LibreOffice. The other localized stuff is in LibreOffice-l10n-en-US. @@ -120,6 +121,7 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs %patch1 %endif + %build %if %prepare_build != 0 # @@ -208,6 +210,7 @@ export PATH="$PATH:/usr/sbin" cd helpcontent2 build --all $PARALLEL_BUILD + %install . ./*Env.Set.sh test -z "%lo_langs" && langs="en-US" || langs="%lo_langs" @@ -230,22 +233,29 @@ for lang in $langs ; do echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist done + %clean rm -rf $RPM_BUILD_ROOT # en-US + %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 diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec index b80d4f9..9d30dc1 100644 --- a/libreoffice-help-group1.spec +++ b/libreoffice-help-group1.spec @@ -99,6 +99,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch + %description This package provides files related to the LibreOffice help development. @@ -106,6 +107,7 @@ development. %if %test_build_langs >= 1 + %package -n libreoffice-help-cs License: LGPLv3 Summary: Czech Help Localization for LibreOffice @@ -120,6 +122,7 @@ Provides: OpenOffice_org-help-cs = %version 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. @@ -129,6 +132,7 @@ is in libreoffice-l10n-cs. %endif %if %test_build_langs >= 2 + %package -n libreoffice-help-da License: LGPLv3 Summary: Danish Help Localization for LibreOffice @@ -143,6 +147,7 @@ Provides: OpenOffice_org-help-da = %version 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. @@ -152,6 +157,7 @@ is in libreoffice-l10n-da. %endif %if %test_build_langs >= 1 + %package -n libreoffice-help-de License: LGPLv3 Summary: German Help Localization for LibreOffice @@ -166,6 +172,7 @@ Provides: OpenOffice_org-help-de = %version 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. @@ -175,6 +182,7 @@ is in libreoffice-l10n-de. %endif %if %test_build_langs >= 2 + %package -n libreoffice-help-en-GB License: LGPLv3 Summary: British Help Localization for LibreOffice @@ -189,6 +197,7 @@ Provides: OpenOffice_org-help-en-GB = %version 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. @@ -196,6 +205,7 @@ is in libreoffice-l10n-en-GB. %endif + %prep %if %prepare_build == 0 %setup -D -T -q -n libreoffice-bootstrap-%version @@ -212,6 +222,7 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs %patch2 %endif + %build %if %prepare_build != 0 # @@ -300,6 +311,7 @@ export PATH="$PATH:/usr/sbin" cd helpcontent2 build --all $PARALLEL_BUILD + %install . ./*Env.Set.sh test -z %lo_langs && langs="en-US" || langs=%lo_langs @@ -322,18 +334,22 @@ for lang in $langs ; do echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist done + %clean rm -rf $RPM_BUILD_ROOT %if %test_build_langs >= 1 # cs + %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 @@ -342,12 +358,15 @@ rm -f %_datadir/%lo_home/help_cs_list.txt.postun 2>/dev/null %if %test_build_langs >= 2 # da + %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 @@ -356,12 +375,15 @@ rm -f %_datadir/%lo_home/help_da_list.txt.postun 2>/dev/null %if %test_build_langs >= 1 # de + %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 @@ -370,12 +392,15 @@ rm -f %_datadir/%lo_home/help_de_list.txt.postun 2>/dev/null %if %test_build_langs >= 2 # en-GB + %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 @@ -383,26 +408,32 @@ rm -f %_datadir/%lo_home/help_en_GB_list.txt.postun 2>/dev/null %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 diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec index 6aa7d51..695b8d9 100644 --- a/libreoffice-help-group2.spec +++ b/libreoffice-help-group2.spec @@ -99,6 +99,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch + %description This package provides files related to the LibreOffice help development. @@ -106,6 +107,7 @@ development. %if %test_build_langs >= 2 + %package -n libreoffice-help-en-ZA License: LGPLv3 Summary: South Africa English Help Localization for LibreOffice @@ -120,6 +122,7 @@ Provides: OpenOffice_org-help-en-ZA = %version 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. @@ -140,6 +143,7 @@ Provides: OpenOffice_org-help-es = %version 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. @@ -160,6 +164,7 @@ Provides: OpenOffice_org-help-et = %version 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. @@ -180,6 +185,7 @@ Provides: OpenOffice_org-help-fr = %version 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. @@ -200,6 +206,7 @@ Provides: OpenOffice_org-help-gl = %version 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. @@ -207,6 +214,7 @@ is in libreoffice-l10n-gl. %endif + %prep %if %prepare_build == 0 %setup -D -T -q -n libreoffice-bootstrap-%version @@ -223,6 +231,7 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs %patch2 %endif + %build %if %prepare_build != 0 # @@ -311,6 +320,7 @@ export PATH="$PATH:/usr/sbin" cd helpcontent2 build --all $PARALLEL_BUILD + %install . ./*Env.Set.sh test -z %lo_langs && langs="en-US" || langs=%lo_langs @@ -333,62 +343,78 @@ for lang in $langs ; do echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist done + %clean rm -rf $RPM_BUILD_ROOT %if %test_build_langs >= 2 # en-ZA + %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 # es + %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 # et + %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 # fr + %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 # gl + %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 @@ -396,20 +422,27 @@ rm -f %_datadir/%lo_home/help_gl_list.txt.postun 2>/dev/null %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 diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec index 3f64c58..1b8622d 100644 --- a/libreoffice-help-group3.spec +++ b/libreoffice-help-group3.spec @@ -99,6 +99,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch + %description This package provides files related to the LibreOffice help development. @@ -106,6 +107,7 @@ development. %if %test_build_langs >= 2 + %package -n libreoffice-help-gu-IN License: LGPLv3 Summary: Gujarati Help Localization for LibreOffice @@ -120,6 +122,7 @@ Provides: OpenOffice_org-help-gu-IN = %version 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. @@ -140,6 +143,7 @@ Provides: OpenOffice_org-help-hi-IN = %version 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. @@ -149,6 +153,7 @@ is in libreoffice-l10n-hi-IN. %endif %if %test_build_langs >= 1 + %package -n libreoffice-help-hu License: LGPLv3 Summary: Hungarian Help Localization for LibreOffice @@ -163,6 +168,7 @@ Provides: OpenOffice_org-help-hu = %version 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. @@ -172,6 +178,7 @@ is in libreoffice-l10n-hu. %endif %if %test_build_langs >= 2 + %package -n libreoffice-help-it License: LGPLv3 Summary: Italian Help Localization for LibreOffice @@ -186,6 +193,7 @@ Provides: OpenOffice_org-help-it = %version 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. @@ -195,6 +203,7 @@ is in libreoffice-l10n-it. %endif %if %test_build_langs >= 1 + %package -n libreoffice-help-ja License: LGPLv3 Summary: Japanese Help Localization for LibreOffice @@ -209,6 +218,7 @@ Provides: OpenOffice_org-help-ja = %version 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. @@ -218,6 +228,7 @@ is in libreoffice-l10n-ja. %endif %if %test_build_langs >= 2 + %package -n libreoffice-help-km License: LGPLv3 Summary: Khmer Help Localization for LibreOffice @@ -232,6 +243,7 @@ Provides: OpenOffice_org-help-km = %version 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. @@ -239,6 +251,7 @@ is in libreoffice-l10n-km. %endif + %prep %if %prepare_build == 0 %setup -D -T -q -n libreoffice-bootstrap-%version @@ -255,6 +268,7 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs %patch2 %endif + %build %if %prepare_build != 0 # @@ -343,6 +357,7 @@ export PATH="$PATH:/usr/sbin" cd helpcontent2 build --all $PARALLEL_BUILD + %install . ./*Env.Set.sh test -z %lo_langs && langs="en-US" || langs=%lo_langs @@ -365,29 +380,36 @@ for lang in $langs ; do echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist done + %clean rm -rf $RPM_BUILD_ROOT %if %test_build_langs >= 2 # gu-IN + %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 # hi-IN + %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 @@ -396,12 +418,15 @@ rm -f %_datadir/%lo_home/help_hi_list.txt.postun 2>/dev/null %if %test_build_langs >= 1 # hu + %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 @@ -410,12 +435,15 @@ rm -f %_datadir/%lo_home/help_hu_list.txt.postun 2>/dev/null %if %test_build_langs >= 2 # it + %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 @@ -424,12 +452,15 @@ rm -f %_datadir/%lo_home/help_it_list.txt.postun 2>/dev/null %if %test_build_langs >= 1 # ja + %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 @@ -438,12 +469,15 @@ rm -f %_datadir/%lo_home/help_ja_list.txt.postun 2>/dev/null %if %test_build_langs >= 2 # km + %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 @@ -451,35 +485,43 @@ rm -f %_datadir/%lo_home/help_km_list.txt.postun 2>/dev/null %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 diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec index 8498a6d..ea315db 100644 --- a/libreoffice-help-group4.spec +++ b/libreoffice-help-group4.spec @@ -99,6 +99,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch + %description This package provides files related to the LibreOffice help development. @@ -106,6 +107,7 @@ development. %if %test_build_langs >= 2 + %package -n libreoffice-help-ko License: LGPLv3 Summary: Korean Help Localization for LibreOffice @@ -120,6 +122,7 @@ Provides: OpenOffice_org-help-ko = %version 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. @@ -140,6 +143,7 @@ Provides: OpenOffice_org-help-nl = %version 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. @@ -160,6 +164,7 @@ Provides: OpenOffice_org-help-pl = %version 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. @@ -180,6 +185,7 @@ Provides: OpenOffice_org-help-pt = %version 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. @@ -187,6 +193,7 @@ is in libreoffice-l10n-pt. %endif + %prep %if %prepare_build == 0 %setup -D -T -q -n libreoffice-bootstrap-%version @@ -203,6 +210,7 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs %patch2 %endif + %build %if %prepare_build != 0 # @@ -291,6 +299,7 @@ export PATH="$PATH:/usr/sbin" cd helpcontent2 build --all $PARALLEL_BUILD + %install . ./*Env.Set.sh test -z %lo_langs && langs="en-US" || langs=%lo_langs @@ -313,51 +322,64 @@ for lang in $langs ; do echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist done + %clean rm -rf $RPM_BUILD_ROOT %if %test_build_langs >= 2 # ko + %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 # nl + %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 # pl + %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 # pt + %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 @@ -365,17 +387,23 @@ rm -f %_datadir/%lo_home/help_pt_list.txt.postun 2>/dev/null %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 diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec index 6a5ddf0..3c3ab33 100644 --- a/libreoffice-help-group5.spec +++ b/libreoffice-help-group5.spec @@ -99,6 +99,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch + %description This package provides files related to the LibreOffice help development. @@ -106,6 +107,7 @@ development. %if %test_build_langs >= 2 + %package -n libreoffice-help-pt-BR License: LGPLv3 Summary: Brazilian Portuguese Help Localization for LibreOffice @@ -120,6 +122,7 @@ Provides: OpenOffice_org-help-pt-BR = %version 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. @@ -140,6 +143,7 @@ Provides: OpenOffice_org-help-ru = %version 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. @@ -160,6 +164,7 @@ Provides: OpenOffice_org-help-sl = %version 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. @@ -180,6 +185,7 @@ Provides: OpenOffice_org-help-sv = %version 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. @@ -200,6 +206,7 @@ Provides: OpenOffice_org-help-zh-CN = %version 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. @@ -220,6 +227,7 @@ Provides: OpenOffice_org-help-zh-TW = %version 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. @@ -227,6 +235,7 @@ is in libreoffice-l10n-zh-TW. %endif + %prep %if %prepare_build == 0 %setup -D -T -q -n libreoffice-bootstrap-%version @@ -243,6 +252,7 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs %patch2 %endif + %build %if %prepare_build != 0 # @@ -331,6 +341,7 @@ export PATH="$PATH:/usr/sbin" cd helpcontent2 build --all $PARALLEL_BUILD + %install . ./*Env.Set.sh test -z %lo_langs && langs="en-US" || langs=%lo_langs @@ -353,73 +364,92 @@ for lang in $langs ; do echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist done + %clean rm -rf $RPM_BUILD_ROOT %if %test_build_langs >= 2 # pt-BR + %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 # ru + %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 # sl + %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 # sv + %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 # zh-CN + %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 # zh-TW + %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 @@ -427,23 +457,31 @@ rm -f %_datadir/%lo_home/help_zh_TW_list.txt.postun 2>/dev/null %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 diff --git a/libreoffice.changes b/libreoffice.changes index c0d82a1..e0b3a5a 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Oct 7 16:32:59 UTC 2011 - anixx@opensuse.org + +- add more detailed categories to desktop files + +------------------------------------------------------------------- +Mon Oct 3 14:00:21 UTC 2011 - pmladek@suse.com + +- svx-globlmn-hrc-build-dep.diff: fix build dependency problem in svx +- apply libreoffice-poppler-0.17.0.patch only on openSUSE > 11.3; + cpp/poppler-version.h is not included in older poppler packages + +------------------------------------------------------------------- +Tue Sep 22 23:35:04 CEST 2011 - fstrba@suse.com + +- desktop-null-display-crash.diff: fix crash on exit. + ------------------------------------------------------------------- Thu Sep 22 18:33:02 UTC 2011 - idonmez@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index f9df18b..1f34860 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -556,6 +556,10 @@ Patch11: nlpsolver-no-broken-help.diff Patch12: scripting-provider-build-dep.diff # fix build with poppler 0.17.0 Patch13: libreoffice-poppler-0.17.0.patch +# fix a crash on exit (backport from master) +Patch14: desktop-null-display-crash.diff +# fix build dependency problem in svx +Patch15: svx-globlmn-hrc-build-dep.diff # # PostgreSQL SDBC driver Patch801: 801-sdbc-postgresql.diff @@ -588,6 +592,7 @@ Patch920: redland-rpath-hack.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc + %description LibreOffice is a comprehensive office package featuring a word processor, a spreadsheet, a presentation program, and much more. This @@ -643,6 +648,7 @@ Obsoletes: OpenOffice_org-base-devel < %version Provides: libreoffice-base-devel = %version Obsoletes: libreoffice-base-devel < %version + %description base This module allows you to manage databases, create queries and reports to track and manage your information by using LibreOffice office @@ -667,6 +673,7 @@ Obsoletes: OpenOffice_org-calc-devel < %version Provides: libreoffice-calc-devel = %version Obsoletes: libreoffice-calc-devel < %version + %description calc This module allows you to perform calculation, analyze information and manage lists in spreadsheets by using LibreOffice office suite. @@ -685,6 +692,7 @@ Supplements: %name Provides: OpenOffice_org-draw = %version Obsoletes: OpenOffice_org-draw < %version + %description draw This module allows you to create and edit drawings, flow charts, and logos by using LibreOffice office suite. @@ -703,6 +711,7 @@ Supplements: %name Provides: OpenOffice_org-math = %version Obsoletes: OpenOffice_org-math < %version + %description math This module allows you to create and edit scientific formulas and equations by using LibreOffice office suite. @@ -726,6 +735,7 @@ Obsoletes: OpenOffice_org-impress-devel < %version Provides: libreoffice-impress-devel = %version Obsoletes: libreoffice-impress-devel < %version + %description impress This module allows you to create and edit presentations for slideshows, meeting and Web pages by using LibreOffice office suite. @@ -749,6 +759,7 @@ Obsoletes: OpenOffice_org-writer-devel < %version Provides: libreoffice-writer-devel = %version Obsoletes: libreoffice-writer-devel < %version + %description writer This module allows you to create and edit text and graphics in letters, reports, documents and Web pages by using LibreOffice office suite. @@ -764,6 +775,7 @@ Requires: postgresql Provides: OpenOffice_org-base-drivers-postgresql = %version Obsoletes: OpenOffice_org-base-drivers-postgresql < %version + %description base-drivers-postgresql This package allows to access PostgreSQL databases from LibreOffice Base. @@ -785,6 +797,7 @@ Supplements: %name Provides: OpenOffice_org-filters-optional = %version Obsoletes: OpenOffice_org-filters-optional < %version + %description filters-optional This package includes some additional import and export filters for LibreOffice: @@ -813,6 +826,7 @@ Supplements: %name Provides: OpenOffice_org-mailmerge = %version Obsoletes: OpenOffice_org-mailmerge < %version + %description mailmerge This module allows you to create form letters or send E-mail messages to many recipients using LibreOffice office suite. @@ -821,6 +835,7 @@ to many recipients using LibreOffice office suite. %if 0%{?suse_version} <= 01130 + %package mono License: LGPLv3 Summary: Mono UNO Bridge for LibreOffice @@ -831,6 +846,7 @@ Requires: %name = %version Provides: OpenOffice_org-mono = %version Obsoletes: OpenOffice_org-mono < %version + %description mono The Mono/UNO binding allows a Mono application to access the complete set of APIs exposed by LibreOffice via UNO. A trivial example @@ -843,6 +859,7 @@ not supported. %endif + %package pyuno License: LGPLv3 Summary: Python UNO Bridge for LibreOffice @@ -855,6 +872,7 @@ Supplements: %name Provides: OpenOffice_org-pyuno = %version Obsoletes: OpenOffice_org-pyuno < %version + %description pyuno The Python-UNO bridge allows to use the standard LibreOffice API from the well known Python scripting language. It can be used to @@ -878,6 +896,7 @@ Requires: %name = %version Provides: OpenOffice_org-testtool = %version Obsoletes: OpenOffice_org-testtool < %version + %description testtool A Tool needed for automatic testing of LibreOffice office suite. @@ -896,6 +915,7 @@ Obsoletes: OpenOffice_org2-gnome Provides: OpenOffice_org-gnome = %version Obsoletes: OpenOffice_org-gnome < %version + %description gnome This package contains some GNOME extensions for LibreOffice. @@ -913,6 +933,7 @@ Obsoletes: OpenOffice_org2-kde Provides: OpenOffice_org-kde = %version Obsoletes: OpenOffice_org-kde < %version + %description kde This package contains some KDE extensions for LibreOffice. @@ -926,11 +947,13 @@ Requires: %name = %version Provides: OpenOffice_org-kde4 = %version Obsoletes: OpenOffice_org-kde4 < %version + %description kde4 This package contains some KDE4 extensions for LibreOffice. %if %lo_build_sdk == yes + %package sdk License: LGPLv3 Summary: LibreOffice SDK @@ -946,6 +969,7 @@ Obsoletes: OpenOffice_org-ure-devel < %version Provides: libreoffice-ure-devel = %version Obsoletes: libreoffice-ure-devel < %version + %description sdk This package contains the files needed to build plugins/add-ons for LibreOffice. It includes header files, IDL files, needed build @@ -969,12 +993,14 @@ Obsoletes: OpenOffice_org-ure-devel-doc < %version Provides: libreoffice-ure-devel-doc = %version Obsoletes: libreoffice-ure-devel-doc < %version + %description sdk-doc This package includes documentation and examples for the LibreOffice Software Development Kit (SDK). %endif + %package officebean License: LGPLv3 Summary: OfficeBean Java Bean component for LibreOffice @@ -987,6 +1013,7 @@ Obsoletes: OpenOffice_org2-officebean < %version Provides: OpenOffice_org-officebean = %version Obsoletes: OpenOffice_org-officebean < %version + %description officebean With the OfficeBean, a developer can easily write Java applications, harnessing the power of LibreOffice. It encapsulates a connection to @@ -1021,6 +1048,7 @@ Recommends: libmysqlclient15 Provides: OpenOffice_org-base-extensions = %version Obsoletes: OpenOffice_org-base-extensions < %version + %description base-extensions This package provides extensions for LibreOffice Base: @@ -1033,6 +1061,7 @@ This package provides extensions for LibreOffice Base: # put the mysql driver into separate package on newer distros %if 0%{?suse_version} >= 01120 + %package base-drivers-mysql License: GPLv2 ; LGPLv3 Summary: MySQL Database Driver for LibreOffice @@ -1044,11 +1073,13 @@ Supplements: packageand(libreoffice-base:mysql-client) Provides: OpenOffice_org-base-drivers-mysql = %version Obsoletes: OpenOffice_org-base-drivers-mysql < %version + %description base-drivers-mysql This package allows to access MySQL databases from LibreOffice Base. %endif + %package calc-extensions License: LGPLv2.1+,LGPLv3 Summary: LibreOffice Calc Extensions @@ -1086,6 +1117,7 @@ Requires: jre >= 1.5 Provides: OpenOffice_org-calc-extensions = %version Obsoletes: OpenOffice_org-calc-extensions < %version + %description calc-extensions This package provides extensions for LibreOffice Calc: @@ -1105,6 +1137,7 @@ Requires: libreoffice-draw = %version Provides: OpenOffice_org-draw-extensions = %version Obsoletes: OpenOffice_org-draw-extensions < %version + %description draw-extensions This package provides extensions for LibreOffice Draw: @@ -1122,6 +1155,7 @@ Requires: libreoffice-impress = %version Provides: OpenOffice_org-impress-extensions = %version Obsoletes: OpenOffice_org-impress-extensions < %version + %description impress-extensions This package provides extensions for LibreOffice Impress: @@ -1166,6 +1200,7 @@ Requires: jre >= 1.5 Provides: OpenOffice_org-writer-extensions = %version Obsoletes: OpenOffice_org-writer-extensions < %version + %description writer-extensions This package provides extensions for LibreOffice Writer: @@ -1183,6 +1218,7 @@ AutoReqProv: off Provides: OpenOffice_org-icon-themes-prebuilt = %version Obsoletes: OpenOffice_org-icon-themes-prebuilt < %version + %description icon-themes-prebuilt This package includes the prebuilt LibreOffice Icon Themes. It is not intended for real use. It needs to be repacked to the real @@ -1258,6 +1294,7 @@ Obsoletes: OpenOffice_org-writer-l10n-prebuilt < %version Provides: libreoffice-writer-l10n-prebuilt = %version Obsoletes: libreoffice-writer-l10n-prebuilt < %version + %description l10n-prebuilt This package includes the prebuilt localization of LibreOffice. It is not intended for a real use. It needs to be repacked to the real @@ -1295,7 +1332,12 @@ cp $RPM_SOURCE_DIR/README* . %patch10 %patch11 %patch12 +%if %suse_version > 1130 +# cpp/poppler-version.h is not included in older poppler packages %patch13 -p1 +%endif +%patch14 +%patch15 # PostgreSQL SDBC driver %patch801 %patch802 @@ -1330,6 +1372,7 @@ cp $RPM_SOURCE_DIR/README* . # %endif + %build %if %prepare_build != 0 # @@ -1463,6 +1506,7 @@ sed -i -e "s|@INSTALLDIR@|%lo_prefix/%lo_home|" pyuno/source/module/uno.py # FIXME: try to finish build even with the strange random build crash in officecfg make || make || make + %install %ifarch x86_64 ppc %if 0%{?suse_version} && 0%{?suse_version} <= 01020 @@ -1488,7 +1532,26 @@ for desktop in * ; do ln -sf $relative_target $desktop_new # suse_update app=`echo $desktop_new | sed "s/.desktop//"` - %suse_update_desktop_file $app + categ="Other" + if test "$app" = "calc"; then + categ="Spreadsheet" + fi + if test "$app" = "writer"; then + categ="WordProcessor" + fi + if test "$app" = "draw"; then + categ="FlowChart" + fi + if test "$app" = "impress"; then + categ="Presentation" + fi + if test "$app" = "base"; then + categ="Database" + fi + if test "$app" = "startcenter"; then + categ="" + fi + %suse_update_desktop_file $app $categ done cd - %endif @@ -1667,9 +1730,11 @@ for file in *.oxt ; do done cd - >/dev/null + %clean rm -rf $RPM_BUILD_ROOT + %pre # crazy hack for the ugly extensions if test $1 -gt 1 ; then @@ -1684,6 +1749,7 @@ if test $1 -gt 1 ; then fi fi + %post /sbin/ldconfig /usr/bin/update-mime-database /usr/share/mime >/dev/null || true @@ -1695,9 +1761,11 @@ fi SuSEconfig --module gtk2 || true %endif + %preun test "$1" = "0" && rm -rf ./%lo_prefix/%lo_home/share/uno_packages/cache || true + %postun /sbin/ldconfig %_prefix/sbin/unopkg-sync-bundled || true @@ -1719,6 +1787,7 @@ if test $1 = 0 ; then fi %endif + %posttrans %_prefix/sbin/unopkg-sync-bundled || true %ifarch %ix86 @@ -1730,12 +1799,15 @@ fi %ifarch %ix86 + %triggerin -- mysql-connector-java %lo_prefix/%lo_home/basis-link/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true + %triggerpostun -- mysql-connector-java %lo_prefix/%lo_home/basis-link/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true + %triggerin -- libstlport_gcc4 # create compat link needed to run upstream extensions (bnc#458952) %lo_prefix/%lo_home/ure/bin/create-libstlport-compat-links || true; @@ -1743,6 +1815,7 @@ fi %ifarch %ix86 + %triggerpostun -- libstlport_gcc4-devel # create compat link needed to run upstream extensions (bnc#458952) %lo_prefix/%lo_home/ure/bin/create-libstlport-compat-links || true; @@ -1750,6 +1823,7 @@ fi %ifarch %ix86 + %triggerpostun -- libstlport_gcc4 # remove compat link needed to run upstream extensions (bnc#458952) if test $2 = 0 ; then @@ -1762,6 +1836,7 @@ exit 0 ##################### + %pre filters-optional if test $1 -gt 1 ; then echo "Unregistering the older LibreOffice optional filter extensions..." @@ -1775,6 +1850,7 @@ fi ##################### + %pre base-drivers-postgresql if test $1 = 2 ; then # unregister all extensions that were registered by LibO <= 3.2.99.3 @@ -1788,6 +1864,7 @@ if test $1 = 2 ; then fi fi + %post base-drivers-postgresql if test -f %lo_prefix/ooo3/share/extension/install/postgresql-sdbc-*.zip ; then echo @@ -1799,14 +1876,17 @@ if test -f %lo_prefix/ooo3/share/extension/install/postgresql-sdbc-*.zip ; then echo fi + %posttrans base-drivers-postgresql %_prefix/sbin/unopkg-sync-bundled || true + %postun base-drivers-postgresql %_prefix/sbin/unopkg-sync-bundled || true # base + %pre base-extensions if test $1 -gt 1 ; then # unregister all extensions that were registered by LibO <= 3.2.99.3 @@ -1821,6 +1901,7 @@ if test $1 -gt 1 ; then unopkg list --shared > /dev/null 2>&1 || true fi + %post base-extensions if test -f %ooo_prefix/ooo3/share/extension/install/report-builder.oxt ; then echo @@ -1841,9 +1922,11 @@ if test -f %ooo_prefix/ooo3/share/extension/install/mysql-connector-ooo.oxt ; th echo fi + %posttrans base-extensions %_prefix/sbin/unopkg-sync-bundled || true + %postun base-extensions %_prefix/sbin/unopkg-sync-bundled || true @@ -1851,6 +1934,7 @@ fi %if 0%{?suse_version} >= 01120 + %pre base-drivers-mysql if test $1 -gt 1 ; then # unregister all extensions that were registered by LibO <= 3.2.99.3 @@ -1861,6 +1945,7 @@ if test $1 -gt 1 ; then unopkg list --shared > /dev/null 2>&1 || true fi + %post base-drivers-mysql if test -f %ooo_prefix/ooo3/share/extension/install/mysql-connector-ooo.oxt ; then echo @@ -1872,9 +1957,11 @@ if test -f %ooo_prefix/ooo3/share/extension/install/mysql-connector-ooo.oxt ; th echo fi + %posttrans base-drivers-mysql %_prefix/sbin/unopkg-sync-bundled || true + %postun base-drivers-mysql %_prefix/sbin/unopkg-sync-bundled || true @@ -1882,6 +1969,7 @@ fi # calc + %pre calc-extensions if test $1 -gt 1 ; then # unregister all extensions that were registered by LibO <= 3.2.99.3 @@ -1905,6 +1993,7 @@ if test $1 -gt 1 ; then unopkg list --shared > /dev/null 2>&1 || true fi + %post calc-extensions if test -f %ooo_prefix/ooo3/share/extension/install/ConvertTextToNumber-*.oxt ; then echo @@ -1934,14 +2023,17 @@ if test -f %ooo_prefix/ooo3/share/extension/install/numbertext-*.oxt ; then echo fi + %posttrans calc-extensions %_prefix/sbin/unopkg-sync-bundled || true + %postun calc-extensions %_prefix/sbin/unopkg-sync-bundled || true # draw + %pre draw-extensions if test $1 -gt 1 ; then # unregister all extensions that were registered by LibO <= 3.2.99.3 @@ -1952,6 +2044,7 @@ if test $1 -gt 1 ; then unopkg list --shared > /dev/null 2>&1 || true fi + %post draw-extensions if test -f %ooo_prefix/ooo3/share/extension/install/pdfimport.oxt ; then echo @@ -1963,14 +2056,17 @@ if test -f %ooo_prefix/ooo3/share/extension/install/pdfimport.oxt ; then echo fi + %posttrans draw-extensions %_prefix/sbin/unopkg-sync-bundled || true + %postun draw-extensions %_prefix/sbin/unopkg-sync-bundled || true # impress + %pre impress-extensions if test $1 -gt 1 ; then # unregister all extensions that were registered by LibO <= 3.2.99.3 @@ -1984,6 +2080,7 @@ if test $1 -gt 1 ; then unopkg list --shared > /dev/null 2>&1 || true fi + %post impress-extensions if test -f %ooo_prefix/ooo3/share/extension/install/presentation-minimizer.oxt ; then echo @@ -2004,14 +2101,17 @@ if test -f %ooo_prefix/ooo3/share/extension/install/presenter-screen.oxt ; then echo fi + %posttrans impress-extensions %_prefix/sbin/unopkg-sync-bundled || true + %postun impress-extensions %_prefix/sbin/unopkg-sync-bundled || true # writer + %pre writer-extensions if test $1 -gt 1 ; then # unregister all extensions that were registered by LibO <= 3.2.99.3 @@ -2029,6 +2129,7 @@ if test $1 -gt 1 ; then unopkg list --shared > /dev/null 2>&1 || true fi + %post writer-extensions if test -f %ooo_prefix/ooo3/share/extension/install/gdocs*.oxt ; then echo @@ -2049,31 +2150,38 @@ if test -f %ooo_prefix/ooo3/share/extension/install/wiki-publisher.oxt ; then echo fi + %posttrans writer-extensions %_prefix/sbin/unopkg-sync-bundled || true + %postun writer-extensions %_prefix/sbin/unopkg-sync-bundled || true # pyuno + %posttrans pyuno %_prefix/sbin/unopkg-sync-bundled || true + %postun pyuno %_prefix/sbin/unopkg-sync-bundled || true # officebean + %posttrans officebean %_prefix/sbin/unopkg-sync-bundled || true + %postun officebean %_prefix/sbin/unopkg-sync-bundled || true ####################### # file lists + %files -f file-lists/common_list.txt %defattr(-,root,root) # common extensions @@ -2083,69 +2191,88 @@ fi %exclude %_datadir/%lo_home/program/*.png %exclude %_datadir/%lo_home/program/shell/*.png + %files -f file-lists/base_list.txt base %defattr(-,root,root) + %files -f file-lists/calc_list.txt calc %defattr(-,root,root) + %files -f file-lists/draw_list.txt draw %defattr(-,root,root) + %files -f file-lists/math_list.txt math %defattr(-,root,root) + %files -f file-lists/impress_list.txt impress %defattr(-,root,root) + %files -f file-lists/writer_list.txt writer %defattr(-,root,root) + %files base-drivers-postgresql %defattr(-,root,root) %lo_prefix/%lo_home/share/extensions/postgresql-sdbc-* + %files -f file-lists/filters_list.txt filters-optional %defattr(-,root,root) + %files -f file-lists/mailmerge_list.txt mailmerge %defattr(-,root,root) %if 0%{?suse_version} <= 01130 + %files -f file-lists/mono_list.txt mono %defattr(-,root,root) %endif + %files -f file-lists/pyuno_list.txt pyuno %defattr(-,root,root) %lo_prefix/%lo_home/share/extensions/script-provider-for-python + %files -f file-lists/testtool_list.txt testtool %defattr(-,root,root) + %files -f file-lists/gnome_list.txt gnome %defattr(-,root,root) + %files -f file-lists/kde_list.txt kde %defattr(-,root,root) + %files -f file-lists/kde4_list.txt kde4 %defattr(-,root,root) + %files -f file-lists/officebean_list.txt officebean %defattr(-,root,root) %lo_prefix/%lo_home/share/extensions/script-provider-for-beanshell %if %lo_build_sdk == yes + %files -f file-lists/sdk_list.txt sdk %defattr(-,root,root) + %files -f file-lists/sdk_doc_list.txt sdk-doc %defattr(-,root,root) %endif + %files base-extensions %defattr(-,root,root) %lo_prefix/%lo_home/share/extensions/report-builder @@ -2155,11 +2282,13 @@ fi %if 0%{?suse_version} >= 01120 + %files base-drivers-mysql %defattr(-,root,root) %lo_prefix/%lo_home/share/extensions/mysql-connector-ooo %endif + %files calc-extensions %defattr(-,root,root) %doc README-scsolver.txt @@ -2167,24 +2296,31 @@ fi %lo_prefix/%lo_home/share/extensions/NLPSolver %lo_prefix/%lo_home/share/extensions/numbertext-%{numbertext_version} + %files draw-extensions %defattr(-,root,root) %lo_prefix/%lo_home/share/extensions/pdfimport + %files impress-extensions %defattr(-,root,root) %lo_prefix/%lo_home/share/extensions/presentation-minimizer %lo_prefix/%lo_home/share/extensions/presenter-screen + %files writer-extensions %defattr(-,root,root) %lo_prefix/%lo_home/share/extensions/gdocs_%{gdocs_version}_modified %lo_prefix/%lo_home/share/extensions/wiki-publisher + %files -f file-lists/icon_themes_prebuilt.txt icon-themes-prebuilt %defattr(-,root,root) + %files -f file-lists/l10n-prebuilt.txt l10n-prebuilt %defattr(-,root,root) + + %changelog diff --git a/svx-globlmn-hrc-build-dep.diff b/svx-globlmn-hrc-build-dep.diff new file mode 100644 index 0000000..225ec4b --- /dev/null +++ b/svx-globlmn-hrc-build-dep.diff @@ -0,0 +1,18 @@ +--- svx/AllLangResTarget_svx.mk.old 2011-05-20 18:05:58.000000000 +0200 ++++ svx/AllLangResTarget_svx.mk 2011-09-13 19:18:36.000000000 +0200 +@@ -120,13 +120,13 @@ endif + $(WORKDIR)/inc/svx/globlmn.hrc : $(realpath $(SRCDIR)/svx/inc/globlmn_tmpl.hrc) $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf) + echo merging $@ + -mkdir -p $(WORKDIR)/inc/svx +- rm -f $(WORKDIR)/inc/svx/lastrun.mk +- echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk + $(call gb_Helper_abbreviate_dirs_native, \ + $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ + -p svx \ + -i $< -o $@ -m $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf) -l all) + $(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc) ++ rm -f $(WORKDIR)/inc/svx/lastrun.mk ++ echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk + endif + + .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean