From a36fa77d8881485a5b23ea1440bea0cdb9eb3fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Mon, 10 Mar 2014 16:48:39 +0100 Subject: [PATCH] Install new plugins as separate packages NetworkManager-atm - libnm-device-plugin-atm.so NetworkManager-bt - libnm-device-plugin-bt.so NetworkManager-wwan - libnm-device-plugin-wwan.so, libnm-wwan.so Upstream commit: c1a064b merge: move ATM, Bluetooth, and WWAN into device plugins (bgo #724324) --- NetworkManager.spec | 56 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/NetworkManager.spec b/NetworkManager.spec index ec678d9..3ee90b1 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -22,6 +22,10 @@ %define systemd_dir %{_prefix}/lib/systemd/system %define udev_dir %{_prefix}/lib/udev +%global with_atm 1 +%global with_bt 1 +%global with_wwan 1 + %if ! 0%{?rhel} && (! 0%{?fedora} || 0%{?fedora} < 20) %ifnarch s390 s390x # No wimax or bluetooth on s390 @@ -134,6 +138,39 @@ It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE devices, and provides VPN integration with a variety of different VPN services. +%if 0%{?with_atm} +%package atm +Summary: ADSL device plugin for NetworkManager +Group: System Environment/Base +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} + +%description atm +This package contains NetworkManager support for ADSL devices. +%endif + + +%if 0%{?with_bt} +%package bt +Summary: Bluetooth device plugin for NetworkManager +Group: System Environment/Base +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} + +%description bt +This package contains NetworkManager support for Bluetooth devices. +%endif + + +%if 0%{?with_wwan} +%package wwan +Summary: Mobile broadband device plugin for NetworkManager +Group: System Environment/Base +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} + +%description wwan +This package contains NetworkManager support for mobile broadband (3G) devices. +%endif + + %if 0%{?with_wimax} %package wimax Summary: Intel WiMAX device support for NetworkManager @@ -379,6 +416,25 @@ fi %{systemd_dir}/network-online.target.wants/NetworkManager-wait-online.service %{_datadir}/doc/NetworkManager/examples/server.conf +%if 0%{?with_atm} +%files atm +%defattr(-,root,root,0755) +%{_libdir}/%{name}/libnm-device-plugin-atm.so +%endif + +%if 0%{?with_bt} +%files bt +%defattr(-,root,root,0755) +%{_libdir}/%{name}/libnm-device-plugin-bt.so +%endif + +%if 0%{?with_wwan} +%files wwan +%defattr(-,root,root,0755) +%{_libdir}/%{name}/libnm-device-plugin-wwan.so +%{_libdir}/%{name}/libnm-wwan.so +%endif + %if 0%{?with_wimax} %files wimax %defattr(-,root,root,0755)