From 0fadb13cbfb41455bd42da4bdf1b98bbc93ad80d6c482c48036a3f11454ebfdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 29 Jul 2014 15:07:59 +0000 Subject: [PATCH 1/7] - Add more provides/obsoletes for lang help files to better handle migration. OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=180 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 504c738..2f5e246 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 29 15:07:13 UTC 2014 - tchvatal@suse.com + +- Add more provides/obsoletes for lang help files to better handle + migration. + ------------------------------------------------------------------- Thu Jul 24 08:33:07 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 00e4d96..6dc10ed 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -740,6 +740,15 @@ BuildArch: noarch \ %{-T: \ Provides: %{name}-help-%{lang} = %{version} \ Obsoletes: %{name}-help-%{lang} < %{version} \ +%{-L: \ +Provides: %{name}-help-%{-L*} = %{version} \ +Obsoletes: %{name}-help-%{-L*} < %{version} \ +} \ +%{-p: \ +Provides: %{name}-help-%{-p*} = %{version} \ +Obsoletes: %{name}-help-%{-p*} = %{version} \ +} \ +} \ } \ \ %description %{pkgname} \ From 68d32ae6d95bdad0d4c906dd0c54badef10475673b5ec8c07cc50c3160196af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 29 Jul 2014 15:21:06 +0000 Subject: [PATCH 2/7] - Try to sort out broken help after migration from 13.1 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=181 --- libreoffice.changes | 5 +++++ libreoffice.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 2f5e246..5361c00 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 29 15:20:41 UTC 2014 - tchvatal@suse.com + +- Try to sort out broken help after migration from 13.1 + ------------------------------------------------------------------- Tue Jul 29 15:07:13 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 6dc10ed..c18fb6a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1162,6 +1162,10 @@ autotextdir="%{_libdir}/%{name}/share/autotext" if [ -d "$helpdir" ]; then rm -rf "$helpdir" || true ln -s "%{_datadir}/%{name}/help" "$helpdir" + # also remove the now broken symlinks + for i in idxcaption.xsl idxcontent.xsl main_transform.xsl; do + rm -rf %{_datadir}/%{name}/help/$i + done fi if [ -d "$autotextdir" ]; then rm -rf "$autotextdir" || true From a22402a729a870aae1d8f313ae5d6470ff7475ea52d28e28325fa4a3785ca958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 29 Jul 2014 15:51:08 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=182 --- libreoffice.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index c18fb6a..f8acfb7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -749,7 +749,6 @@ Provides: %{name}-help-%{-p*} = %{version} \ Obsoletes: %{name}-help-%{-p*} = %{version} \ } \ } \ -} \ \ %description %{pkgname} \ Provides additional %{langname} translations and resources for %{project}. \ From 71d1e5137f10a166aa361acbf9cb79a7f034f36f293540412e89615fff0cfc4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 30 Jul 2014 09:12:42 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=183 --- libreoffice.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index f8acfb7..df680cd 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1161,10 +1161,6 @@ autotextdir="%{_libdir}/%{name}/share/autotext" if [ -d "$helpdir" ]; then rm -rf "$helpdir" || true ln -s "%{_datadir}/%{name}/help" "$helpdir" - # also remove the now broken symlinks - for i in idxcaption.xsl idxcontent.xsl main_transform.xsl; do - rm -rf %{_datadir}/%{name}/help/$i - done fi if [ -d "$autotextdir" ]; then rm -rf "$autotextdir" || true From 14d198c71d5cbdfcc7d3b3ede7e13927e59ce107d282cfcc3fc157d70cff2d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 1 Aug 2014 07:59:24 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=184 --- libreoffice.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index df680cd..79d6be6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1146,7 +1146,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/readmes/ # We have ton of duped files so run over it %fdupes %{buildroot}/usr -%pre +%pretrans # 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. @@ -1160,6 +1160,7 @@ 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" fi if [ -d "$autotextdir" ]; then From 99289157eb230ea4ad879ac5e3d8d29afed1a56617a6ee11e749e480bdbad0ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 1 Aug 2014 08:02:04 +0000 Subject: [PATCH 6/7] - Version bump to 4.3.0.4: * Final 4.3.0 release containing handful of last fixes from the 4.3.0.4 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=185 --- libreoffice-4.3.0.3.tar.xz | 3 --- libreoffice-4.3.0.4.tar.xz | 3 +++ libreoffice-help-4.3.0.3.tar.xz | 3 --- libreoffice-help-4.3.0.4.tar.xz | 3 +++ libreoffice-translations-4.3.0.3.tar.xz | 3 --- libreoffice-translations-4.3.0.4.tar.xz | 3 +++ libreoffice.changes | 7 +++++++ libreoffice.spec | 2 +- 8 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 libreoffice-4.3.0.3.tar.xz create mode 100644 libreoffice-4.3.0.4.tar.xz delete mode 100644 libreoffice-help-4.3.0.3.tar.xz create mode 100644 libreoffice-help-4.3.0.4.tar.xz delete mode 100644 libreoffice-translations-4.3.0.3.tar.xz create mode 100644 libreoffice-translations-4.3.0.4.tar.xz diff --git a/libreoffice-4.3.0.3.tar.xz b/libreoffice-4.3.0.3.tar.xz deleted file mode 100644 index 09104ed..0000000 --- a/libreoffice-4.3.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b11c64f6bdf3cc7a1f88929a8be1f7e840f145de252991692dc168b874a5e0f -size 152014908 diff --git a/libreoffice-4.3.0.4.tar.xz b/libreoffice-4.3.0.4.tar.xz new file mode 100644 index 0000000..4ea2199 --- /dev/null +++ b/libreoffice-4.3.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28fe2c027fe6ebb2f7ff54bc5bb919fef029576011436652c340e026b92dc0e4 +size 152025208 diff --git a/libreoffice-help-4.3.0.3.tar.xz b/libreoffice-help-4.3.0.3.tar.xz deleted file mode 100644 index 1e767fa..0000000 --- a/libreoffice-help-4.3.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5092d50b38b7acd53470b013be1ec78aedc327f9152f2b0e4e1628e0e58bcb20 -size 1855252 diff --git a/libreoffice-help-4.3.0.4.tar.xz b/libreoffice-help-4.3.0.4.tar.xz new file mode 100644 index 0000000..a36db12 --- /dev/null +++ b/libreoffice-help-4.3.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe748508afb0521c697d3021c6a436a0a48f1aeb2037b5bb66be5ad242607a2b +size 1855244 diff --git a/libreoffice-translations-4.3.0.3.tar.xz b/libreoffice-translations-4.3.0.3.tar.xz deleted file mode 100644 index 70263aa..0000000 --- a/libreoffice-translations-4.3.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5803e4749b76442f85715001b085629b6e831b1aaaa3bda38e6ae8165e02aaf7 -size 126781888 diff --git a/libreoffice-translations-4.3.0.4.tar.xz b/libreoffice-translations-4.3.0.4.tar.xz new file mode 100644 index 0000000..9be7e10 --- /dev/null +++ b/libreoffice-translations-4.3.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21dfbe4ec59def1f71a65bcaec75dc72dde2e30dfa8e6dda6100c64a902884d0 +size 126845872 diff --git a/libreoffice.changes b/libreoffice.changes index 5361c00..0f1f628 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 1 08:01:00 UTC 2014 - tchvatal@suse.com + +- Version bump to 4.3.0.4: + * Final 4.3.0 release containing handful of last fixes from the + 4.3.0.4 + ------------------------------------------------------------------- Tue Jul 29 15:20:41 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 79d6be6..b03a82f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -32,7 +32,7 @@ %define tarball_url http://download.documentfoundation.org/libreoffice/src/4.3.0/ # This is used due to the need for beta releases Name: libreoffice -Version: 4.3.0.3 +Version: 4.3.0.4 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C From d7f40713b9bc8be95405bd7fbfa0875a5e73f57b4f170b00b3cb54d129d7e2f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 8 Aug 2014 12:58:59 +0000 Subject: [PATCH 7/7] - Require some fonts for compat: liberation / carlito fonts. bnc#824908 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=186 --- libreoffice.changes | 5 +++++ libreoffice.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 0f1f628..1a69b52 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 8 12:57:33 UTC 2014 - tchvatal@suse.com + +- Require some fonts for compat: liberation / carlito fonts. bnc#824908 + ------------------------------------------------------------------- Fri Aug 1 08:01:00 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index b03a82f..4e5f7e5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -206,9 +206,11 @@ BuildRequires: xorg-x11-fonts BuildRequires: xz BuildRequires: zip BuildRequires: pkgconfig(fbembed) +Requires: google-carlito-fonts Requires: libreoffice-branding >= 4.0 Requires: libreoffice-icon-themes = %{version} # We need at least english to launch ourselves. +Requires: liberation-fonts Requires: libreoffice-l10n-en = %{version} Requires: python3 Requires(post): coreutils