diff --git a/.gitignore b/.gitignore index 55e3140..7a42993 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,9 @@ /17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip /185d60944ea767075d27247c3162b3bc-unowinreg.dll /libreoffice-multiliblauncher.sh -/libreoffice-6.1.1.2.tar.xz -/libreoffice-6.1.1.2.tar.xz.asc -/libreoffice-help-6.1.1.2.tar.xz -/libreoffice-help-6.1.1.2.tar.xz.asc -/libreoffice-translations-6.1.1.2.tar.xz -/libreoffice-translations-6.1.1.2.tar.xz.asc +/libreoffice-6.1.2.1.tar.xz +/libreoffice-6.1.2.1.tar.xz.asc +/libreoffice-help-6.1.2.1.tar.xz +/libreoffice-help-6.1.2.1.tar.xz.asc +/libreoffice-translations-6.1.2.1.tar.xz +/libreoffice-translations-6.1.2.1.tar.xz.asc diff --git a/libreoffice.spec b/libreoffice.spec index 380bafd..277eda4 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 6.1.1 +%global libo_version 6.1.2 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -32,12 +32,10 @@ %endif # URL for external projects' tarballs %global external_url http://dev-www.libreoffice.org/src -%if 0%{?fedora} -%global weak_deps 1 -%endif %if 0%{?rhel} && 0%{?rhel} < 8 %nil %else +%global weak_deps 1 %global file_triggers 1 %endif %global girapiversion 0.1 @@ -63,7 +61,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 +Version: %{libo_version}.1 Release: 1%{?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 MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -320,15 +318,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} @@ -336,7 +325,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 @@ -349,18 +337,15 @@ 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 %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} Requires: %{name}-gtk3%{?_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 -%endif Requires: %{name}-langpack-en = %{epoch}:%{version}-%{release} # rhbz#949106 libreoffice-core drags in both openjdk 1.7.0 and 1.8.0 Requires: java-headless >= 1:1.6 @@ -801,7 +786,7 @@ Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} \ %if 0%{?weak_deps} \ %{-p:Supplements: (%{name}-core%{?_isa} and langpacks-%{-p*})} \ %{!-p:Supplements: (%{name}-core%{?_isa} and langpacks-%{lang})} \ -%{-T:Recommends: %{name}-help-%{lang}} \ +%{-T:Requires: %{name}-help-%{lang}} \ %endif \ \ %description %{pkgname} \ @@ -2327,6 +2312,10 @@ done %{_includedir}/LibreOfficeKit %changelog +* Wed Oct 10 2018 Caolán McNamara - 1:6.1.2.1-1 +- latest version +- rhbz#1637848 keep Supplements but not Recommends + * Fri Sep 14 2018 Caolán McNamara - 1:6.1.1.2-1 - latest version diff --git a/sources b/sources index 77d2590..1854dd3 100644 --- a/sources +++ b/sources @@ -11,3 +11,9 @@ SHA512 (libreoffice-help-6.1.1.2.tar.xz) = 6e22a3efa9c6db97dec27a5f6ef21efb0c066 SHA512 (libreoffice-help-6.1.1.2.tar.xz.asc) = 28b056a4872ed29af9e7ab17ea574abbc23c3fd9a8d899066b326bd19babafb1bb12ec8f06fbd223b285796beb572c25a8b41daa6507f6c0b18e6bff075041e5 SHA512 (libreoffice-translations-6.1.1.2.tar.xz) = 093d79016ba12151e0781df89b06a49d6d65a9e95a3b9f7a82b5f3ef377b465dd2ab34f62c5027991a09335546db6158ef8b8a0d86de90acbda2ce0afedf6240 SHA512 (libreoffice-translations-6.1.1.2.tar.xz.asc) = 2eca519a8f712cb46eafe5de38b144cffcc7496283958986f8efa943693bb684dca493f350c02093884d7f53f347a0804fe4c88ee7534f5e30fbec9433ea486e +SHA512 (libreoffice-6.1.2.1.tar.xz) = b7c7839da8251fd0f01794381d77a5abd4d092f21589df046402a1d332d782608aa00ab29ad60c9a34f27f11576d70c5a678e87a0f53c5b4065ae59fe77a0367 +SHA512 (libreoffice-6.1.2.1.tar.xz.asc) = c69280e41801a58f41a6ba221813346690891de1d50d1aa24fdfd0cfc029960428b0f8e323916513252262d19c726dc931a4f1dd769ac97baa299bf4e44cb45f +SHA512 (libreoffice-help-6.1.2.1.tar.xz) = 6cabaed79d0405e4e35af3e3689561e0d447bbf98b081b6a40fd52c37bda7b0886d4df4ea1c2deaa7db56c26933b5697ae4ef796f6e763a58b7ee729debcca6e +SHA512 (libreoffice-help-6.1.2.1.tar.xz.asc) = 54113c35636c78c9c64defc672da889b620dd230ee2e4f528c2a9087ba6468fb9e04fd4213e5467f3b94dcddac56e6daf8524a55d9a23c99d5d73641af75de3b +SHA512 (libreoffice-translations-6.1.2.1.tar.xz) = 26ea250c4cfe77929b1b95026da0874f34dd161550ba78a1db99350f4234d6b5b1a8e3e0553f248151aa7344fea1ef1a1589751381a4a5ecc7ff5dc0cb3e1e59 +SHA512 (libreoffice-translations-6.1.2.1.tar.xz.asc) = 13080d06ca7cddf5c7cc79861b5508a7214112aabc3f3c594f679a21fcb0ba5896753130507e2101811bd5a3ca968d2c1480207494e4934fc566c147fb05b36d