diff --git a/wireless-regdb.spec b/wireless-regdb.spec index ea08a0c..2f14742 100644 --- a/wireless-regdb.spec +++ b/wireless-regdb.spec @@ -2,7 +2,7 @@ Name: wireless-regdb Version: 2018.05.31 -Release: 3%{?dist} +Release: 3.1%{?dist} Summary: Regulatory database for 802.11 wireless networking Group: System Environment/Base @@ -16,9 +16,11 @@ Requires: kernel >= 4.15 BuildRequires: systemd-devel -# Temporarily disable Provides so as to prevent unintended upgrades +# This package should replace crda, for now use Conflicts to ensure +# that only one or the other is installed... +Conflicts: crda #Provides: crda = 3.18_2018.05.31-3 -Obsoletes: crda <= 3.18_2018.05.31-2 +#Obsoletes: crda <= 3.18_2018.05.31-2 Source0: http://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-%{version}.tar.xz Source1: setregdomain @@ -66,6 +68,9 @@ install -D -pm 0644 %SOURCE3 %{buildroot}%{_udevrulesdir}/85-regulatory.rules %changelog +* Thu Aug 02 2018 John W. Linville - 2018.05.31-3.1 +- Replace Obsoletes with Conflicts for desired installation behavior + * Wed Jul 18 2018 John W. Linville - 2018.05.31-3 - Fix-up changelog typos and bump Release