From f0b1252d429442ca885b72f5b4de160758b68265 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 3 Sep 2015 17:19:45 +0200 Subject: [PATCH] Wimax is gone for good --- NetworkManager.spec | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index 06004ab..6c27069 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -22,16 +22,10 @@ %global with_bluetooth 1 %global with_team 1 %global with_wifi 1 -%global with_wimax 0 %global with_wwan 1 %global with_nmtui 1 %global regen_docs 1 -# WiMAX still supported on <= F19 -%if ! 0%{?rhel} && (! 0%{?fedora} || 0%{?fedora} < 20) -%global with_wimax 1 -%endif - # ModemManager on Fedora < 20 too old for Bluetooth && wwan %if (0%{?fedora} && 0%{?fedora} < 20) %global with_bluetooth 0 @@ -96,6 +90,7 @@ Requires: iptables Requires: readline Obsoletes: dhcdbd Obsoletes: NetworkManager < %{obsoletes_nmver} +Obsoletes: NetworkManager-wimax < 1.2 Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1 @@ -133,9 +128,6 @@ BuildRequires: iptables %if 0%{?with_bluetooth} BuildRequires: bluez-libs-devel %endif -%if 0%{?with_wimax} -BuildRequires: wimax-devel -%endif BuildRequires: systemd >= 200-3 systemd-devel BuildRequires: libsoup-devel BuildRequires: libndp-devel >= 1.0 @@ -229,19 +221,6 @@ This package contains NetworkManager support for mobile broadband (WWAN) devices %endif -%if 0%{?with_wimax} -%package wimax -Summary: Intel WiMAX device support for NetworkManager -Group: System Environment/Base -Requires: wimax -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description wimax -This package contains NetworkManager support for Intel WiMAX mobile broadband -devices. -%endif - - %package devel Summary: Headers defining the NetworkManager D-Bus APIs Group: Development/Libraries @@ -378,11 +357,6 @@ intltoolize --force %endif %else --enable-wifi=no \ -%endif -%if 0%{?with_wimax} - --enable-wimax=yes \ -%else - --enable-wimax=no \ %endif --enable-vala=yes \ %if 0%{?regen_docs} @@ -573,11 +547,6 @@ fi %{_libdir}/%{name}/libnm-wwan.so %endif -%if 0%{?with_wimax} -%files wimax -%{_libdir}/%{name}/libnm-device-plugin-wimax.so -%endif - %files devel %doc ChangeLog docs/api/html/* %dir %{_includedir}/%{name}