Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory
checked in at Tue Oct 11 17:58:44 CEST 2011.
--------
libreoffice-help-en-US.changes: same change
libreoffice-help-group1.changes: same change
libreoffice-help-group2.changes: same change
libreoffice-help-group3.changes: same change
libreoffice-help-group4.changes: same change
libreoffice-help-group5.changes: same change
--- openSUSE:Factory/libreoffice/libreoffice.changes 2011-09-26
10:08:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/libreoffice/libreoffice.changes
2011-10-07 18:34:22.000000000 +0200
@@ -1,0 +2,17 @@
+Fri Oct 7 16:32:59 UTC 2011 - an...@opensuse.org
+
+- add more detailed categories to desktop files
+
+-------------------------------------------------------------------
+Mon Oct 3 14:00:21 UTC 2011 - pmla...@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 - fst...@suse.com
+
+- desktop-null-display-crash.diff: fix crash on exit.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
desktop-null-display-crash.diff
svx-globlmn-hrc-build-dep.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice-branding-upstream.spec ++++++
--- /var/tmp/diff_new_pack.a0nChz/_old 2011-10-11 17:58:36.000000000 +0200
+++ /var/tmp/diff_new_pack.a0nChz/_new 2011-10-11 17:58:36.000000000 +0200
@@ -75,6 +75,7 @@
#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 @@
%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 @@
$RPM_BUILD_ROOT%_datadir/%lo_home/program/$pict
done
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%files
%defattr(-,root,root)
%_datadir/%lo_home
+
+
%changelog
++++++ libreoffice-help-en-US.spec ++++++
--- /var/tmp/diff_new_pack.a0nChz/_old 2011-10-11 17:58:36.000000000 +0200
+++ /var/tmp/diff_new_pack.a0nChz/_new 2011-10-11 17:58:36.000000000 +0200
@@ -100,6 +100,7 @@
#!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 @@
%patch1
%endif
+
%build
%if %prepare_build != 0
#
@@ -208,6 +210,7 @@
cd helpcontent2
build --all $PARALLEL_BUILD
+
%install
. ./*Env.Set.sh
test -z "%lo_langs" && langs="en-US" || langs="%lo_langs"
@@ -230,22 +233,29 @@
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
++++++ libreoffice-help-group1.spec ++++++
--- /var/tmp/diff_new_pack.a0nChz/_old 2011-10-11 17:58:36.000000000 +0200
+++ /var/tmp/diff_new_pack.a0nChz/_new 2011-10-11 17:58:36.000000000 +0200
@@ -99,6 +99,7 @@
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
+
%description
This package provides files related to the LibreOffice help
development.
@@ -106,6 +107,7 @@
%if %test_build_langs >= 1
+
%package -n libreoffice-help-cs
License: LGPLv3
Summary: Czech Help Localization for LibreOffice
@@ -120,6 +122,7 @@
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 @@
%endif
%if %test_build_langs >= 2
+
%package -n libreoffice-help-da
License: LGPLv3
Summary: Danish Help Localization for LibreOffice
@@ -143,6 +147,7 @@
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 @@
%endif
%if %test_build_langs >= 1
+
%package -n libreoffice-help-de
License: LGPLv3
Summary: German Help Localization for LibreOffice
@@ -166,6 +172,7 @@
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 @@
%endif
%if %test_build_langs >= 2
+
%package -n libreoffice-help-en-GB
License: LGPLv3
Summary: British Help Localization for LibreOffice
@@ -189,6 +197,7 @@
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 @@
%endif
+
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@@ -212,6 +222,7 @@
%patch2
%endif
+
%build
%if %prepare_build != 0
#
@@ -300,6 +311,7 @@
cd helpcontent2
build --all $PARALLEL_BUILD
+
%install
. ./*Env.Set.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs
@@ -322,18 +334,22 @@
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 @@
%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 @@
%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 @@
%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 @@
%if %test_build_langs >= 1
+
%files -f file-lists/help_cs_list.txt -n libreoffice-help-cs
%defattr(-,root,root)
%endif
%if %test_build_langs >= 2
+
%files -f file-lists/help_da_list.txt -n libreoffice-help-da
%defattr(-,root,root)
%endif
%if %test_build_langs >= 1
+
%files -f file-lists/help_de_list.txt -n libreoffice-help-de
%defattr(-,root,root)
%endif
%if %test_build_langs >= 2
+
%files -f file-lists/help_en_GB_list.txt -n libreoffice-help-en-GB
%defattr(-,root,root)
%endif
+
+
%changelog
++++++ libreoffice-help-group2.spec ++++++
--- /var/tmp/diff_new_pack.a0nChz/_old 2011-10-11 17:58:36.000000000 +0200
+++ /var/tmp/diff_new_pack.a0nChz/_new 2011-10-11 17:58:36.000000000 +0200
@@ -99,6 +99,7 @@
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
+
%description
This package provides files related to the LibreOffice help
development.
@@ -106,6 +107,7 @@
%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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
%endif
+
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@@ -223,6 +231,7 @@
%patch2
%endif
+
%build
%if %prepare_build != 0
#
@@ -311,6 +320,7 @@
cd helpcontent2
build --all $PARALLEL_BUILD
+
%install
. ./*Env.Set.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs
@@ -333,62 +343,78 @@
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 @@
%if %test_build_langs >= 2
+
%files -f file-lists/help_en_ZA_list.txt -n libreoffice-help-en-ZA
%defattr(-,root,root)
+
%files -f file-lists/help_es_list.txt -n libreoffice-help-es
%defattr(-,root,root)
+
%files -f file-lists/help_et_list.txt -n libreoffice-help-et
%defattr(-,root,root)
+
%files -f file-lists/help_fr_list.txt -n libreoffice-help-fr
%defattr(-,root,root)
+
%files -f file-lists/help_gl_list.txt -n libreoffice-help-gl
%defattr(-,root,root)
%endif
+
+
%changelog
++++++ libreoffice-help-group3.spec ++++++
--- /var/tmp/diff_new_pack.a0nChz/_old 2011-10-11 17:58:36.000000000 +0200
+++ /var/tmp/diff_new_pack.a0nChz/_new 2011-10-11 17:58:36.000000000 +0200
@@ -99,6 +99,7 @@
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
+
%description
This package provides files related to the LibreOffice help
development.
@@ -106,6 +107,7 @@
%if %test_build_langs >= 2
+
%package -n libreoffice-help-gu-IN
License: LGPLv3
Summary: Gujarati Help Localization for LibreOffice
@@ -120,6 +122,7 @@
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 @@
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 @@
%endif
%if %test_build_langs >= 1
+
%package -n libreoffice-help-hu
License: LGPLv3
Summary: Hungarian Help Localization for LibreOffice
@@ -163,6 +168,7 @@
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 @@
%endif
%if %test_build_langs >= 2
+
%package -n libreoffice-help-it
License: LGPLv3
Summary: Italian Help Localization for LibreOffice
@@ -186,6 +193,7 @@
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 @@
%endif
%if %test_build_langs >= 1
+
%package -n libreoffice-help-ja
License: LGPLv3
Summary: Japanese Help Localization for LibreOffice
@@ -209,6 +218,7 @@
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 @@
%endif
%if %test_build_langs >= 2
+
%package -n libreoffice-help-km
License: LGPLv3
Summary: Khmer Help Localization for LibreOffice
@@ -232,6 +243,7 @@
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 @@
%endif
+
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@@ -255,6 +268,7 @@
%patch2
%endif
+
%build
%if %prepare_build != 0
#
@@ -343,6 +357,7 @@
cd helpcontent2
build --all $PARALLEL_BUILD
+
%install
. ./*Env.Set.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs
@@ -365,29 +380,36 @@
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 @@
%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 @@
%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 @@
%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 @@
%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 @@
%if %test_build_langs >= 2
+
%files -f file-lists/help_gu_list.txt -n libreoffice-help-gu-IN
%defattr(-,root,root)
+
%files -f file-lists/help_hi_list.txt -n libreoffice-help-hi-IN
%defattr(-,root,root)
%endif
%if %test_build_langs >= 1
+
%files -f file-lists/help_hu_list.txt -n libreoffice-help-hu
%defattr(-,root,root)
%endif
%if %test_build_langs >= 2
+
%files -f file-lists/help_it_list.txt -n libreoffice-help-it
%defattr(-,root,root)
%endif
%if %test_build_langs >= 1
+
%files -f file-lists/help_ja_list.txt -n libreoffice-help-ja
%defattr(-,root,root)
%endif
%if %test_build_langs >= 2
+
%files -f file-lists/help_km_list.txt -n libreoffice-help-km
%defattr(-,root,root)
%endif
+
+
%changelog
++++++ libreoffice-help-group4.spec ++++++
--- /var/tmp/diff_new_pack.a0nChz/_old 2011-10-11 17:58:36.000000000 +0200
+++ /var/tmp/diff_new_pack.a0nChz/_new 2011-10-11 17:58:36.000000000 +0200
@@ -99,6 +99,7 @@
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
+
%description
This package provides files related to the LibreOffice help
development.
@@ -106,6 +107,7 @@
%if %test_build_langs >= 2
+
%package -n libreoffice-help-ko
License: LGPLv3
Summary: Korean Help Localization for LibreOffice
@@ -120,6 +122,7 @@
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 @@
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 @@
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 @@
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 @@
%endif
+
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@@ -203,6 +210,7 @@
%patch2
%endif
+
%build
%if %prepare_build != 0
#
@@ -291,6 +299,7 @@
cd helpcontent2
build --all $PARALLEL_BUILD
+
%install
. ./*Env.Set.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs
@@ -313,51 +322,64 @@
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 @@
%if %test_build_langs >= 2
+
%files -f file-lists/help_ko_list.txt -n libreoffice-help-ko
%defattr(-,root,root)
+
%files -f file-lists/help_nl_list.txt -n libreoffice-help-nl
%defattr(-,root,root)
+
%files -f file-lists/help_pl_list.txt -n libreoffice-help-pl
%defattr(-,root,root)
+
%files -f file-lists/help_pt_list.txt -n libreoffice-help-pt
%defattr(-,root,root)
%endif
+
+
%changelog
++++++ libreoffice-help-group5.spec ++++++
--- /var/tmp/diff_new_pack.a0nChz/_old 2011-10-11 17:58:36.000000000 +0200
+++ /var/tmp/diff_new_pack.a0nChz/_new 2011-10-11 17:58:36.000000000 +0200
@@ -99,6 +99,7 @@
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
+
%description
This package provides files related to the LibreOffice help
development.
@@ -106,6 +107,7 @@
%if %test_build_langs >= 2
+
%package -n libreoffice-help-pt-BR
License: LGPLv3
Summary: Brazilian Portuguese Help Localization for LibreOffice
@@ -120,6 +122,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
%endif
+
%prep
%if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version
@@ -243,6 +252,7 @@
%patch2
%endif
+
%build
%if %prepare_build != 0
#
@@ -331,6 +341,7 @@
cd helpcontent2
build --all $PARALLEL_BUILD
+
%install
. ./*Env.Set.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs
@@ -353,73 +364,92 @@
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 @@
%if %test_build_langs >= 2
+
%files -f file-lists/help_pt_BR_list.txt -n libreoffice-help-pt-BR
%defattr(-,root,root)
+
%files -f file-lists/help_ru_list.txt -n libreoffice-help-ru
%defattr(-,root,root)
+
%files -f file-lists/help_sl_list.txt -n libreoffice-help-sl
%defattr(-,root,root)
+
%files -f file-lists/help_sv_list.txt -n libreoffice-help-sv
%defattr(-,root,root)
+
%files -f file-lists/help_zh_CN_list.txt -n libreoffice-help-zh-CN
%defattr(-,root,root)
+
%files -f file-lists/help_zh_TW_list.txt -n libreoffice-help-zh-TW
%defattr(-,root,root)
%endif
+
+
%changelog
++++++ libreoffice.spec ++++++
++++ 758 lines (skipped)
++++ between openSUSE:Factory/libreoffice/libreoffice.spec
++++ and /mounts/work_src_done/STABLE/libreoffice/libreoffice.spec
++++++ desktop-null-display-crash.diff ++++++
--- 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 );
++++++ svx-globlmn-hrc-build-dep.diff ++++++
--- 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
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
