contrib: fix team sub-package obsoletes
authorDan Williams <dcbw@redhat.com>
Mon, 22 Dec 2014 15:48:22 +0000 (09:48 -0600)
committerDan Williams <dcbw@redhat.com>
Mon, 22 Dec 2014 16:29:09 +0000 (10:29 -0600)
Team was split out between NM 0.9.10 and NM 1.0 after the other
sub-packages, so the existing obsoletes won't work for it (they
would cause all upgrades to install all sub-packages, instead
of replacing existing sub-packages without adding uninstalled
ones).  We only want to unconditionally add the team sub-package.

contrib/fedora/rpm/NetworkManager.spec

index 95f41d5..66d2bbe 100644 (file)
@@ -224,6 +224,8 @@ Group: System Environment/Base
 BuildRequires: teamd-devel
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Obsoletes: NetworkManager < %{obsoletes_nmver}
+# Team was split from main NM binary between 0.9.10 and 1.0
+Obsoletes: NetworkManager < 1.0.0
 
 %description team
 This package contains NetworkManager support for team devices.