From 3d4ac175ca7a6cfbf2fc1046a00ab563bb0cd725 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 10 May 2016 08:08:37 +0200 Subject: [PATCH] Resolves: rhbz#1333899 recommended pkgs are omitted from def. install ... so back to hard Requires, sigh. --- libreoffice.spec | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 0193070..50a7a36 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -55,7 +55,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.0 -Release: 3%{?libo_prerelease}%{?dist} +Release: 4%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -271,15 +271,6 @@ formats, including Microsoft Office File Formats. Summary: All import / export filters Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release} -%if 0%{?weak_deps} -Recommends: %{name}-calc%{?_isa} = %{epoch}:%{version}-%{release} -Recommends: %{name}-draw%{?_isa} = %{epoch}:%{version}-%{release} -Recommends: %{name}-graphicfilter%{?_isa} = %{epoch}:%{version}-%{release} -Recommends: %{name}-impress%{?_isa} = %{epoch}:%{version}-%{release} -Recommends: %{name}-math%{?_isa} = %{epoch}:%{version}-%{release} -Recommends: %{name}-writer%{?_isa} = %{epoch}:%{version}-%{release} -Recommends: %{name}-xsltfilter%{?_isa} = %{epoch}:%{version}-%{release} -%else Requires: %{name}-calc%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-draw%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-graphicfilter%{?_isa} = %{epoch}:%{version}-%{release} @@ -287,7 +278,6 @@ Requires: %{name}-impress%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-math%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-writer%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-xsltfilter%{?_isa} = %{epoch}:%{version}-%{release} -%endif %description filters Metapackage to pull in all subpackages that contain import or export @@ -298,21 +288,17 @@ Summary: Core modules for LibreOffice Requires: %{name}-%{fontname}-fonts = %{epoch}:%{version}-%{release} Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-data = %{epoch}:%{version}-%{release} -%if 0%{?weak_deps} -Requires: %{name}-plugin%{?_isa} = %{epoch}:%{version}-%{release} -Recommends: liberation-sans-fonts, liberation-serif-fonts, liberation-mono-fonts -Recommends: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts -Recommends: google-crosextra-caladea-fonts, google-crosextra-carlito-fonts -Recommends: %{name}-langpack-en = %{epoch}:%{version}-%{release} +%if 0%{fedora} +Requires: %{name}-gtk3%{?_isa} = %{epoch}:%{version}-%{release} %else # these two plugins used to be part of core--keep it that way Requires: %{name}-gtk2%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-x11%{?_isa} = %{epoch}:%{version}-%{release} +%endif Requires: liberation-sans-fonts, liberation-serif-fonts, liberation-mono-fonts Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts Requires: google-crosextra-caladea-fonts, google-crosextra-carlito-fonts Requires: %{name}-langpack-en = %{epoch}:%{version}-%{release} -%endif # rhbz#949106 libreoffice-core drags in both openjdk 1.7.0 and 1.8.0 Requires: java-headless >= 1:1.6 Obsoletes: libreoffice-appdata < 1:4.3.3.0 @@ -2252,6 +2238,10 @@ done %endif %changelog +* Tue May 10 2016 David Tardon - 1:5.2.0.0-4.alpha1 +- Resolves: rhbz#1333899 recommended pkgs are omitted from default + installation + * Tue May 3 2016 Marek Kasik - 1:5.2.0.0-3.alpha1 - Rebuild for poppler-0.43.0