From ac00497cb0651a647484adf55088634ac17517de90463d1c3e918074c1dd7986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 5 Mar 2015 12:51:26 +0000 Subject: [PATCH 1/2] - Move pretrans to pre OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=228 --- libreoffice.changes | 5 +++++ libreoffice.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index d73af4c..61bb3a7 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 5 12:51:02 UTC 2015 - tchvatal@suse.com + +- Move pretrans to pre + ------------------------------------------------------------------- Thu Feb 26 21:06:18 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 5b7c1e9..a6266d1 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1121,7 +1121,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/readmes/ # We have ton of duped files so run over it %fdupes %{buildroot}/usr -%pretrans +%pre # do not crate cache for bundled extensions because it is not secure # rather remove it (fdo#53006, fdo#51252, bnc#769448) # Remove after 12.2 is out of support/migration scope. @@ -1136,12 +1136,13 @@ autotextdir="%{_libdir}/%{name}/share/autotext" if [ -d "$helpdir" ]; then rm -rf "$helpdir" || true rm -f %{_datadir}/%{name}/help/* || true - ln -s "%{_datadir}/%{name}/help" "$helpdir" + ln -s "%{_datadir}/%{name}/help" "$helpdir" || true fi if [ -d "$autotextdir" ]; then rm -rf "$autotextdir" || true - ln -s "%{_datadir}/%{name}/share/autotext" "$autotextdir" + ln -s "%{_datadir}/%{name}/share/autotext" "$autotextdir" || true fi +exit 0 %post /sbin/ldconfig From 00e37aa25fed0e5d1fceecb5605219efed53ac0bc92fec12014510cbde252c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 6 Mar 2015 12:31:34 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=229 --- libreoffice.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index a6266d1..3e21f36 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1135,12 +1135,9 @@ helpdir="%{_libdir}/%{name}/help" autotextdir="%{_libdir}/%{name}/share/autotext" if [ -d "$helpdir" ]; then rm -rf "$helpdir" || true - rm -f %{_datadir}/%{name}/help/* || true - ln -s "%{_datadir}/%{name}/help" "$helpdir" || true fi if [ -d "$autotextdir" ]; then rm -rf "$autotextdir" || true - ln -s "%{_datadir}/%{name}/share/autotext" "$autotextdir" || true fi exit 0