diff options
author | Thomas Haller <thaller@redhat.com> | 2014-06-18 11:10:52 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2014-06-27 13:27:01 +0200 |
commit | 38a83e15a2f741a4a038ce5c55f1ad41b59f69a1 (patch) | |
tree | c6d98fd28194f65ae29edb168e3860e218c8ab90 /contrib | |
parent | dfe4b45f87a9302c55542848b102f07a6ddf50f3 (diff) | |
download | NetworkManager-38a83e15a2f741a4a038ce5c55f1ad41b59f69a1.tar.gz |
team: make team support a plugin
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 99cb9099fc..f4b22e8c92 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -36,6 +36,7 @@ %global with_adsl 1 %global with_bluetooth 1 +%global with_team 1 %global with_wifi 1 %global with_wimax 0 %global with_wwan 1 @@ -59,8 +60,8 @@ %global with_wwan 0 %endif -%if 0%{?rhel} || (0%{?fedora} > 19) -%global with_teamctl 1 +%if (0%{?fedora} && 0%{?fedora} <= 19) +%global with_team 0 %endif @@ -155,9 +156,6 @@ BuildRequires: ModemManager-glib-devel >= 1.0 %if 0%{?with_nmtui} BuildRequires: newt-devel %endif -%if 0%{?with_teamctl} -BuildRequires: teamd-devel -%endif %description @@ -200,6 +198,19 @@ This package contains NetworkManager support for Bluetooth devices. %endif +%if 0%{?with_team} +%package team +Summary: Team device plugin for NetworkManager +Group: System Environment/Base +BuildRequires: teamd-devel +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: NetworkManager < %{obsoletes_nmver} + +%description team +This package contains NetworkManager support for team devices. +%endif + + %if 0%{?with_wifi} %package wifi Summary: Wifi plugin for NetworkManager @@ -347,7 +358,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment. %else --with-wext=no \ %endif -%if 0%{?with_teamctl} +%if 0%{?with_team} --enable-teamdctl=yes \ %else --enable-teamdctl=no \ @@ -489,6 +500,12 @@ fi %exclude %{_libdir}/%{name}/libnm-device-plugin-bluetooth.so %endif +%if 0%{?with_team} +%files team +%defattr(-,root,root,0755) +%{_libdir}/%{name}/libnm-device-plugin-team.so +%endif + %if 0%{?with_wifi} %files wifi %defattr(-,root,root,0755) |