diff options
| author | Michal Domonkos <mdomonko@redhat.com> | 2019-05-27 17:08:20 +0300 |
|---|---|---|
| committer | pkratoch <pkratoch@redhat.com> | 2019-05-28 10:49:14 +0300 |
| commit | f95aca505807dde8f097d0853c6015415b03b0a3 (patch) | |
| tree | 958fd376a83b22720e118c5f81bf41089630e054 /createrepo_c.spec | |
| parent | 5afe56697037387420bc1b66a4246c03cffb45bf (diff) | |
[spec] Obsolete createrepo on all Fedoras again (RhBug:1702771)
When upgrading createrepo (legacy) on a Fedora 30 system, DNF replaces
(obsoletes) it with createrepo_c. However, with the conditionals added
in commit 2090473b, DNF no longer picks the latest available version of
createrepo_c from the updates repo. Instead, the pre-2090473b version
is selected from the stable (frozen) repo.
To fix that, this commit partially reverts the above commit so that we
obsolete everywhere but on RHEL-7 where createrepo is still a core
component with full support.
Reproducer:
$ dnf install createrepo.noarch # installs the legacy createrepo
$ dnf upgrade createrepo
Before: Upgrades to createrepo_c from stable
After: Upgrades to createrepo_c from updates
Diffstat (limited to 'createrepo_c.spec')
| -rw-r--r-- | createrepo_c.spec | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/createrepo_c.spec b/createrepo_c.spec index c081f52..843aa2e 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -72,7 +72,7 @@ Requires: rpm >= 4.9.0 BuildRequires: drpm-devel >= 0.1.3 %endif -%if 0%{?fedora} > 30 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 Obsoletes: createrepo < 0.11.0 Provides: createrepo = %{version}-%{release} %endif @@ -200,7 +200,7 @@ pushd build-py3 popd %endif -%if 0%{?fedora} > 30 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 ln -sr %{buildroot}%{_bindir}/createrepo_c %{buildroot}%{_bindir}/createrepo ln -sr %{buildroot}%{_bindir}/mergerepo_c %{buildroot}%{_bindir}/mergerepo ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo @@ -225,7 +225,7 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo %{_bindir}/modifyrepo_c %{_bindir}/sqliterepo_c -%if 0%{?fedora} > 30 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 %{_bindir}/createrepo %{_bindir}/mergerepo %{_bindir}/modifyrepo |