rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: rhbz#1490318 do not use versioned Supplements

Browse Source 
It does not work if the requested version is not available anymore:
dnf update # updates libreoffice
 # some time passes, a new libreoffice appears in updates
dnf install langpacks-de # doesn't install libreoffice-langpack-de
dnf remove langpacks-de
dnf update
dnf install langpacks-de # does install libreoffice-langpack-de
This commit is contained in:
David Tardon 2017-09-12 11:22:35 +02:00
parent ce55bff910
commit 00e2674654
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libreoffice.spec
View File

@ -57,7 +57,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
Release: 2%{?libo_prerelease}%{?dist}
Release: 3%{?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/
@ -659,7 +659,7 @@ Requires: gdb%{?_isa}
Requires: %{libo_python}-six
Requires: libreoffice-core%{?_isa} = %{epoch}:%{version}-%{release}
%if 0%{?weak_deps}
Supplements: libreoffice-debuginfo%{?_isa} = %{epoch}:%{version}-%{release}
Supplements: libreoffice-debuginfo%{?_isa}
%endif
%description gdb-debug-support
@ -743,8 +743,8 @@ Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} \
%{-p:Provides: %{name}-langpack-%{-p*} = %{epoch}:%{version}-%{release}} \
%{-p:Provides: %{name}-langpack-%{-p*}%{?_isa} = %{epoch}:%{version}-%{release}} \
%if 0%{?weak_deps} \
%{-p:Supplements: (%{name}-core%{?_isa} = %{epoch}:%{version}-%{release} and langpacks-%{-p*})} \
%{!-p:Supplements: (%{name}-core%{?_isa} = %{epoch}:%{version}-%{release} and langpacks-%{lang})} \
%{-p:Supplements: (%{name}-core%{?_isa} and langpacks-%{-p*})} \
%{!-p:Supplements: (%{name}-core%{?_isa} and langpacks-%{lang})} \
%{-T:Recommends: %{name}-help-%{lang}} \
%endif \
\
@ -2201,6 +2201,9 @@ done
%{_includedir}/LibreOfficeKit
%changelog
* Tue Sep 12 2017 David Tardon <dtardon@redhat.com> - 1:5.4.1.2-3
- Resolves: rhbz#1490318 do not use versioned Supplements
* Fri Sep 08 2017 David Tardon <dtardon@redhat.com> - 1:5.4.1.2-2
- rebuild for poppler 0.59.0