diff --git a/SPECS/rpm.spec b/SPECS/rpm.spec index cb51112..6043883 100644 --- a/SPECS/rpm.spec +++ b/SPECS/rpm.spec @@ -30,7 +30,7 @@ %global rpmver 4.14.2 #global snapver rc2 -%global rel 36 +%global rel 37 %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} @@ -336,6 +336,11 @@ BuildRequires: python3-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} Provides: %{name}-python3 = %{version}-%{release} Obsoletes: %{name}-python3 < %{version}-%{release} +# Lowest compatible DNF version (acts as a safeguard to protect DNF from +# breaking in case the user attempts to upgrade RPM separately). +# Version 4.2.7 added support for the new API output format introduced in +# rpm-4.14.2-10. +Conflicts: python3-dnf < 4.2.7 %description -n python3-%{name} The python3-rpm package contains a module that permits applications @@ -673,6 +678,9 @@ make check || cat tests/rpmtests.log %doc doc/librpm/html/* %changelog +* Fri Feb 21 2020 Michal Domonkos - 4.14.2-37 +- Add API safeguard for DNF by using Conflicts: (#1790400) + * Thu Jan 09 2020 Panu Matilainen - 4.14.2-36 - Revert DBUS shutdown patch, it causes regressions (#1783346)