summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2014-12-22 09:48:22 -0600
committerDan Williams <dcbw@redhat.com>2014-12-22 10:29:09 -0600
commit3aede801521ef7bff039e6e3f1b3c7b566b4338d (patch)
tree92bca73b1ce90b7df43e58f999ebcb4ba1046b29
parent3cbce6994a094d078f02543301522005e837cb55 (diff)
downloadNetworkManager-3aede801521ef7bff039e6e3f1b3c7b566b4338d.tar.gz
contrib: fix team sub-package obsoletes
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.
-rw-r--r--contrib/fedora/rpm/NetworkManager.spec2
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 95f41d5393..66d2bbe6b0 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -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.