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 504c738..1a69b52 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +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 + +- 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 + +- Try to sort out broken help after migration from 13.1 + +------------------------------------------------------------------- +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..4e5f7e5 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 @@ -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 @@ -740,6 +742,14 @@ 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} \ @@ -1138,7 +1148,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. @@ -1152,6 +1162,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