From af102ccccc1b86bf4bbae8d0d8cce06858f73b90b1a49293d69b6976d8b2fecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 9 Apr 2015 12:42:47 +0000 Subject: [PATCH 1/4] - Remove patch to look for help in /usr/share, we symlink it back to lib, so there is no actual need to search for it directly, migth fix bnc#915996: * officecfg-help-in-usr-share.diff OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=242 --- libreoffice.changes | 8 ++++++++ libreoffice.spec | 4 ---- officecfg-help-in-usr-share.diff | 35 -------------------------------- 3 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 officecfg-help-in-usr-share.diff diff --git a/libreoffice.changes b/libreoffice.changes index 2ad5d22..2a1d1a1 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 9 12:42:00 UTC 2015 - tchvatal@suse.com + +- Remove patch to look for help in /usr/share, we symlink it back to + lib, so there is no actual need to search for it directly, migth + fix bnc#915996: + * officecfg-help-in-usr-share.diff + ------------------------------------------------------------------- Wed Apr 8 13:06:41 UTC 2015 - andras.timar@collabora.com diff --git a/libreoffice.spec b/libreoffice.spec index 996c0e9..6170b6c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -60,9 +60,6 @@ Source2003: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip # Needed for wiki-published and always taken as bundled Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -# search help icons in %{_prefix}/share -# FIXME: make it configurable in integrate into git -Patch0: officecfg-help-in-usr-share.diff # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build # FIXME: make it configurable and push upstream @@ -838,7 +835,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %prep %setup -q -b1 -b2 -%patch0 -p1 %patch1 %patch2 -p1 %patch3 -p1 diff --git a/officecfg-help-in-usr-share.diff b/officecfg-help-in-usr-share.diff deleted file mode 100644 index 05d4006..0000000 --- a/officecfg-help-in-usr-share.diff +++ /dev/null @@ -1,35 +0,0 @@ -Index: libreoffice-4.4.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu -=================================================================== ---- libreoffice-4.4.0.1.orig/officecfg/registry/data/org/openoffice/Office/Paths.xcu -+++ libreoffice-4.4.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu -@@ -98,7 +98,7 @@ - - - -- -+ - - - -Index: libreoffice-4.4.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs -=================================================================== ---- libreoffice-4.4.0.1.orig/officecfg/registry/schema/org/openoffice/Office/Common.xcs -+++ libreoffice-4.4.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs -@@ -1615,7 +1615,7 @@ - - Specifies the path to the Office help files. - -- $(instpath)/@LIBO_SHARE_HELP_FOLDER@ -+ /usr/share/help - - - -@@ -1810,7 +1810,7 @@ - Specifies the default directory where Office help files are - located. - -- $(instpath)/@LIBO_SHARE_HELP_FOLDER@ -+ /usr/share/help - - - From 6c86ddd4afb0ef3430a0b1521cd84be98a1d561db93fbff1f2a8d246d92fc1cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 9 Apr 2015 13:13:32 +0000 Subject: [PATCH 2/4] - Clean up the uno cache removal to not display scarry message bnc#900186 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=243 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 2a1d1a1..8f5b98c 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 9 13:12:21 UTC 2015 - tchvatal@suse.com + +- Clean up the uno cache removal to not display scarry message + bnc#900186 + ------------------------------------------------------------------- Thu Apr 9 12:42:00 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 6170b6c..c3a82c1 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1154,8 +1154,9 @@ exit 0 %preun uno_cache="%{_libdir}/%{name}/share/uno_packages/cache" if [ "$1" = "0" ] ; then - test -d "$uno_cache" && rm -rf "$uno_cache"/* || true; + test -d "$uno_cache" && rm -rf "$uno_cache" fi +exit 0 %postun /sbin/ldconfig From f0d1748c656a9516a4ce073cf0d602658c0fdfe6774503818f715824b539b6e9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 13 Apr 2015 15:42:25 +0000 Subject: [PATCH 3/4] unbreak OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=244 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index c3a82c1..af708c5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1107,7 +1107,7 @@ ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib} %if 0%{?suse_version} > 1315 install -m 0755 -d %{buildroot}%{_datadir}/appdata for appdata in base calc draw impress writer; do - sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop}/" \ + sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop/" \ sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml > %{buildroot}%{_datadir}/appdata/${appdata}.appdata.xml done %endif From 1c744d33b5e7bd1ea40565d21bf0fc7cd107c293a71096d0fab5880fc868c83e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 14 Apr 2015 13:49:39 +0000 Subject: [PATCH 4/4] - Silence more scarry messages by bnc#900186 * Fixes autocorr symlinking * Cleans UNO cache in more pretty way OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=245 --- libreoffice.changes | 13 +++++++++++++ libreoffice.spec | 23 +++++++++-------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 8f5b98c..ed20e2d 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Apr 14 13:49:22 UTC 2015 - tchvatal@suse.com + +- Hopefully fix bnc#913042.Redo check phase that sometimes broke + .jar generating + +------------------------------------------------------------------- +Tue Apr 14 13:43:32 UTC 2015 - tchvatal@suse.com + +- Silence more scarry messages by bnc#900186 + * Fixes autocorr symlinking + * Cleans UNO cache in more pretty way + ------------------------------------------------------------------- Thu Apr 9 13:12:21 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index af708c5..b8deb1e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -965,11 +965,9 @@ export NOCONFIGURE=yes sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py # just call make here as we added the jobs in configure -make build-nocheck - -%check -make unitcheck -make slowcheck +# The check phase is run here too if it is split with nocheck +# install of jars get broken sometimes +make VERBOSE=true %install make DESTDIR=%{buildroot} distro-pack-install @@ -1080,10 +1078,10 @@ done %make_autocorr_aliases -l en-US en-PH %make_autocorr_aliases -l en-ZA en-NA en-ZW %make_autocorr_aliases -l af-ZA af-NA -%make_autocorr_aliases -l de-DE de-AT de-BE de-CH de-LI de-LU -%make_autocorr_aliases -l es-ES es-AR es-BO es-CL es-CO es-CR es-CU es-DO es-EC es-GT es-HN es-MX es-NI es-PA es-PE es-PR es-PY es-SV es-US es-UY es-VE -%make_autocorr_aliases -l fr-FR fr-BE fr-CA fr-CH fr-LU fr-MC -%make_autocorr_aliases -l it-IT it-CH +%make_autocorr_aliases -l de de-DE de-AT de-BE de-CH de-LI de-LU +%make_autocorr_aliases -l es es-ES es-AR es-BO es-CL es-CO es-CR es-CU es-DO es-EC es-GT es-HN es-MX es-NI es-PA es-PE es-PR es-PY es-SV es-US es-UY es-VE +%make_autocorr_aliases -l fr fr-FR fr-BE fr-CA fr-CH fr-LU fr-MC +%make_autocorr_aliases -l it it-IT it-CH %make_autocorr_aliases -l nl-NL nl-AW %make_autocorr_aliases -l sv-SE sv-FI pushd %{buildroot}%{_libdir}/%{name}/share/autocorr @@ -1112,9 +1110,6 @@ for appdata in base calc draw impress writer; do done %endif -# Remove translations source as we need more space -rm -rf translations/source/ - # Merge kde and kde4 filelists as we do not bother with compat anymore # Not worth fixing unless really cleaning up the install completely cat file-lists/kde_list.txt >> file-lists/kde4_list.txt @@ -1152,9 +1147,9 @@ exit 0 %icon_theme_cache_post %preun -uno_cache="%{_libdir}/%{name}/share/uno_packages/cache" +uno_cache="%{_libdir}/%{name}/share/uno_packages/cache/uno_packages/" if [ "$1" = "0" ] ; then - test -d "$uno_cache" && rm -rf "$uno_cache" + test -d "$uno_cache" && rm -rf "$uno_cache"/* fi exit 0