Accepting request 84623 from LibreOffice:Unstable

- Fix build with poppler 0.17.0
- Add python-lxml dependency for faster translation processing (forwarded request 84617 from namtrac)

OBS-URL: https://build.opensuse.org/request/show/84623
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=22
This commit is contained in:
Sascha Peilicke 2011-09-26 08:08:32 +00:00 committed by Git OBS Bridge
parent 66b79a1c1f
commit 129a70963b
10 changed files with 70 additions and 269 deletions

View File

@ -75,7 +75,6 @@ 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.
@ -85,10 +84,8 @@ office suite.
%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 @@ 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

View File

@ -100,7 +100,6 @@ 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.
@ -121,7 +120,6 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
%patch1
%endif
%build
%if %prepare_build != 0
#
@ -210,7 +208,6 @@ 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"
@ -233,7 +230,6 @@ for lang in $langs ; do
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
%clean
rm -rf $RPM_BUILD_ROOT
@ -242,19 +238,14 @@ rm -rf $RPM_BUILD_ROOT
%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

View File

@ -99,7 +99,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
%description
This package provides files related to the LibreOffice help
development.
@ -107,7 +106,6 @@ development.
%if %test_build_langs >= 1
%package -n libreoffice-help-cs
License: LGPLv3
Summary: Czech Help Localization for LibreOffice
@ -122,7 +120,6 @@ 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.
@ -132,7 +129,6 @@ is in libreoffice-l10n-cs.
%endif
%if %test_build_langs >= 2
%package -n libreoffice-help-da
License: LGPLv3
Summary: Danish Help Localization for LibreOffice
@ -147,7 +143,6 @@ 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.
@ -157,7 +152,6 @@ is in libreoffice-l10n-da.
%endif
%if %test_build_langs >= 1
%package -n libreoffice-help-de
License: LGPLv3
Summary: German Help Localization for LibreOffice
@ -172,7 +166,6 @@ 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.
@ -182,7 +175,6 @@ 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
@ -197,7 +189,6 @@ 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.
@ -205,7 +196,6 @@ is in libreoffice-l10n-en-GB.
%endif
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@ -222,7 +212,6 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
%patch2
%endif
%build
%if %prepare_build != 0
#
@ -311,7 +300,6 @@ 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
@ -334,7 +322,6 @@ for lang in $langs ; do
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
%clean
rm -rf $RPM_BUILD_ROOT
@ -344,11 +331,9 @@ rm -rf $RPM_BUILD_ROOT
%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 @@ rm -f %_datadir/%lo_home/help_cs_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_da_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_de_list.txt.postun 2>/dev/null
%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 @@ 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

View File

@ -99,7 +99,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
%description
This package provides files related to the LibreOffice help
development.
@ -107,7 +106,6 @@ development.
%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 @@ 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.
@ -143,7 +140,6 @@ 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.
@ -164,7 +160,6 @@ 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.
@ -185,7 +180,6 @@ 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.
@ -206,7 +200,6 @@ 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.
@ -214,7 +207,6 @@ is in libreoffice-l10n-gl.
%endif
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@ -231,7 +223,6 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
%patch2
%endif
%build
%if %prepare_build != 0
#
@ -320,7 +311,6 @@ 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
@ -343,7 +333,6 @@ for lang in $langs ; do
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
%clean
rm -rf $RPM_BUILD_ROOT
@ -353,11 +342,9 @@ rm -rf $RPM_BUILD_ROOT
%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 @@ rm -f %_datadir/%lo_home/help_en_ZA_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_es_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_et_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_fr_list.txt.postun 2>/dev/null
%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 @@ 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

View File

@ -99,7 +99,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
%description
This package provides files related to the LibreOffice help
development.
@ -107,7 +106,6 @@ development.
%if %test_build_langs >= 2
%package -n libreoffice-help-gu-IN
License: LGPLv3
Summary: Gujarati Help Localization for LibreOffice
@ -122,7 +120,6 @@ 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.
@ -143,7 +140,6 @@ 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.
@ -153,7 +149,6 @@ 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
@ -168,7 +163,6 @@ 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.
@ -178,7 +172,6 @@ is in libreoffice-l10n-hu.
%endif
%if %test_build_langs >= 2
%package -n libreoffice-help-it
License: LGPLv3
Summary: Italian Help Localization for LibreOffice
@ -193,7 +186,6 @@ 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.
@ -203,7 +195,6 @@ is in libreoffice-l10n-it.
%endif
%if %test_build_langs >= 1
%package -n libreoffice-help-ja
License: LGPLv3
Summary: Japanese Help Localization for LibreOffice
@ -218,7 +209,6 @@ 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.
@ -228,7 +218,6 @@ is in libreoffice-l10n-ja.
%endif
%if %test_build_langs >= 2
%package -n libreoffice-help-km
License: LGPLv3
Summary: Khmer Help Localization for LibreOffice
@ -243,7 +232,6 @@ 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.
@ -251,7 +239,6 @@ is in libreoffice-l10n-km.
%endif
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@ -268,7 +255,6 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
%patch2
%endif
%build
%if %prepare_build != 0
#
@ -357,7 +343,6 @@ 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
@ -380,7 +365,6 @@ for lang in $langs ; do
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
%clean
rm -rf $RPM_BUILD_ROOT
@ -390,11 +374,9 @@ rm -rf $RPM_BUILD_ROOT
%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 @@ rm -f %_datadir/%lo_home/help_gu_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_hi_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_hu_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_it_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_ja_list.txt.postun 2>/dev/null
%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 @@ 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

View File

@ -99,7 +99,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
%description
This package provides files related to the LibreOffice help
development.
@ -107,7 +106,6 @@ development.
%if %test_build_langs >= 2
%package -n libreoffice-help-ko
License: LGPLv3
Summary: Korean Help Localization for LibreOffice
@ -122,7 +120,6 @@ 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.
@ -143,7 +140,6 @@ 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.
@ -164,7 +160,6 @@ 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.
@ -185,7 +180,6 @@ 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.
@ -193,7 +187,6 @@ is in libreoffice-l10n-pt.
%endif
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@ -210,7 +203,6 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
%patch2
%endif
%build
%if %prepare_build != 0
#
@ -299,7 +291,6 @@ 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,7 +313,6 @@ for lang in $langs ; do
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
%clean
rm -rf $RPM_BUILD_ROOT
@ -332,11 +322,9 @@ rm -rf $RPM_BUILD_ROOT
%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 @@ rm -f %_datadir/%lo_home/help_ko_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_nl_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_pl_list.txt.postun 2>/dev/null
%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 @@ 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

View File

@ -99,7 +99,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
%description
This package provides files related to the LibreOffice help
development.
@ -107,7 +106,6 @@ development.
%if %test_build_langs >= 2
%package -n libreoffice-help-pt-BR
License: LGPLv3
Summary: Brazilian Portuguese Help Localization for LibreOffice
@ -122,7 +120,6 @@ 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.
@ -143,7 +140,6 @@ 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.
@ -164,7 +160,6 @@ 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.
@ -185,7 +180,6 @@ 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.
@ -206,7 +200,6 @@ 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.
@ -227,7 +220,6 @@ 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.
@ -235,7 +227,6 @@ is in libreoffice-l10n-zh-TW.
%endif
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@ -252,7 +243,6 @@ cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
%patch2
%endif
%build
%if %prepare_build != 0
#
@ -341,7 +331,6 @@ 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
@ -364,7 +353,6 @@ for lang in $langs ; do
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
%clean
rm -rf $RPM_BUILD_ROOT
@ -374,11 +362,9 @@ rm -rf $RPM_BUILD_ROOT
%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 @@ rm -f %_datadir/%lo_home/help_pt_BR_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_ru_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_sl_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_sv_list.txt.postun 2>/dev/null
%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 @@ rm -f %_datadir/%lo_home/help_zh_CN_list.txt.postun 2>/dev/null
%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 @@ 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

View File

@ -0,0 +1,60 @@
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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Sep 22 18:33:02 UTC 2011 - idonmez@suse.com
- Fix build with poppler 0.17.0
- Add python-lxml dependency for faster translation processing
-------------------------------------------------------------------
Mon Sep 12 16:48:48 UTC 2011 - pmladek@suse.com

View File

@ -104,7 +104,7 @@ BuildRequires: hunspell-devel libwpd-devel libwpg-devel libwps-devel
# CODE10 features
############################
%if 0%{?suse_version} > 01000
BuildRequires: gstreamer010-plugins-base-devel sablot-devel xalan-j2 xerces-j2 xml-commons-apis
BuildRequires: gstreamer010-plugins-base-devel python-lxml sablot-devel xalan-j2 xerces-j2 xml-commons-apis
%endif
%if 0%{?meego_version}
BuildRequires: gst-plugins-base-devel sablot-devel xalan-j2 xerces-j2 xml-commons-apis
@ -554,6 +554,8 @@ Patch10: system-python-ure-bootstrap.diff
Patch11: nlpsolver-no-broken-help.diff
# make sure that the extra jar files are bundled with the script provider extensions
Patch12: scripting-provider-build-dep.diff
# fix build with poppler 0.17.0
Patch13: libreoffice-poppler-0.17.0.patch
#
# PostgreSQL SDBC driver
Patch801: 801-sdbc-postgresql.diff
@ -586,7 +588,6 @@ 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
@ -642,7 +643,6 @@ 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,7 +667,6 @@ 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.
@ -686,7 +685,6 @@ 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.
@ -705,7 +703,6 @@ 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.
@ -729,7 +726,6 @@ 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.
@ -753,7 +749,6 @@ 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.
@ -769,7 +764,6 @@ 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.
@ -791,7 +785,6 @@ 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:
@ -820,7 +813,6 @@ 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.
@ -829,7 +821,6 @@ to many recipients using LibreOffice office suite.
%if 0%{?suse_version} <= 01130
%package mono
License: LGPLv3
Summary: Mono UNO Bridge for LibreOffice
@ -840,7 +831,6 @@ 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
@ -853,7 +843,6 @@ not supported.
%endif
%package pyuno
License: LGPLv3
Summary: Python UNO Bridge for LibreOffice
@ -866,7 +855,6 @@ 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
@ -890,7 +878,6 @@ 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.
@ -909,7 +896,6 @@ Obsoletes: OpenOffice_org2-gnome
Provides: OpenOffice_org-gnome = %version
Obsoletes: OpenOffice_org-gnome < %version
%description gnome
This package contains some GNOME extensions for LibreOffice.
@ -927,7 +913,6 @@ Obsoletes: OpenOffice_org2-kde
Provides: OpenOffice_org-kde = %version
Obsoletes: OpenOffice_org-kde < %version
%description kde
This package contains some KDE extensions for LibreOffice.
@ -941,13 +926,11 @@ 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
@ -963,7 +946,6 @@ 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
@ -987,14 +969,12 @@ 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
@ -1007,7 +987,6 @@ 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
@ -1042,7 +1021,6 @@ Recommends: libmysqlclient15
Provides: OpenOffice_org-base-extensions = %version
Obsoletes: OpenOffice_org-base-extensions < %version
%description base-extensions
This package provides extensions for LibreOffice Base:
@ -1055,7 +1033,6 @@ 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
@ -1067,13 +1044,11 @@ 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
@ -1111,7 +1086,6 @@ 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:
@ -1131,7 +1105,6 @@ 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:
@ -1149,7 +1122,6 @@ 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:
@ -1194,7 +1166,6 @@ 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:
@ -1212,7 +1183,6 @@ 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
@ -1288,7 +1258,6 @@ 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
@ -1326,6 +1295,7 @@ cp $RPM_SOURCE_DIR/README* .
%patch10
%patch11
%patch12
%patch13 -p1
# PostgreSQL SDBC driver
%patch801
%patch802
@ -1360,7 +1330,6 @@ cp $RPM_SOURCE_DIR/README* .
#
%endif
%build
%if %prepare_build != 0
#
@ -1494,7 +1463,6 @@ 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
@ -1699,11 +1667,9 @@ 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
@ -1718,7 +1684,6 @@ if test $1 -gt 1 ; then
fi
fi
%post
/sbin/ldconfig
/usr/bin/update-mime-database /usr/share/mime >/dev/null || true
@ -1730,11 +1695,9 @@ 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
@ -1756,7 +1719,6 @@ if test $1 = 0 ; then
fi
%endif
%posttrans
%_prefix/sbin/unopkg-sync-bundled || true
%ifarch %ix86
@ -1768,15 +1730,12 @@ 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;
@ -1784,7 +1743,6 @@ 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;
@ -1792,7 +1750,6 @@ fi
%ifarch %ix86
%triggerpostun -- libstlport_gcc4
# remove compat link needed to run upstream extensions (bnc#458952)
if test $2 = 0 ; then
@ -1831,7 +1788,6 @@ 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
@ -1843,17 +1799,14 @@ 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
@ -1868,7 +1821,6 @@ 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
@ -1889,11 +1841,9 @@ 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
@ -1901,7 +1851,6 @@ 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
@ -1912,7 +1861,6 @@ 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
@ -1924,11 +1872,9 @@ 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
@ -1936,7 +1882,6 @@ fi
# calc
%pre calc-extensions
if test $1 -gt 1 ; then
# unregister all extensions that were registered by LibO <= 3.2.99.3
@ -1960,7 +1905,6 @@ 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
@ -1990,17 +1934,14 @@ 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
@ -2011,7 +1952,6 @@ 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
@ -2023,17 +1963,14 @@ 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
@ -2047,7 +1984,6 @@ 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
@ -2068,17 +2004,14 @@ 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
@ -2096,7 +2029,6 @@ 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
@ -2117,38 +2049,31 @@ 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
@ -2158,40 +2083,31 @@ 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)
@ -2201,44 +2117,35 @@ fi
%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
@ -2248,13 +2155,11 @@ 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
@ -2262,31 +2167,24 @@ 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