[NetworkManager] Drop wimax.
Bill Nottingham
notting at fedoraproject.org
Fri Sep 20 15:03:08 UTC 2013
commit f6ce6625212d9da8f8108628bb5f40bbbae36fcd
Author: Bill Nottingham <notting at redhat.com>
Date: Fri Sep 20 10:02:52 2013 -0500
Drop wimax.
NetworkManager.spec | 39 ++++-----------------------------------
1 files changed, 4 insertions(+), 35 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index bcf5b66..ea6fd1a 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -19,7 +19,7 @@ Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
Version: 0.9.9.0
-Release: 11%{snapshot}%{?dist}
+Release: 12%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@@ -84,12 +84,6 @@ BuildRequires: libuuid-devel
BuildRequires: libgudev1-devel >= 143
BuildRequires: vala-tools
BuildRequires: iptables
-# No wimax or bluetooth on s390
-%if ! 0%{?rhel}
-%ifnarch s390 s390x
-BuildRequires: wimax-devel
-%endif
-%endif
BuildRequires: systemd >= 200-3 systemd-devel
BuildRequires: libsoup-devel
BuildRequires: libndp-devel >= 1.0
@@ -102,21 +96,6 @@ It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE devices, and
provides VPN integration with a variety of different VPN services.
-%if ! 0%{?rhel}
-%ifnarch s390 s390x
-%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
-%endif
-
-
%package devel
Summary: Libraries and headers for adding NetworkManager support to applications
Group: Development/Libraries
@@ -193,11 +172,6 @@ deployments.
--enable-ppp=yes \
--with-modem-manager-1=yes \
--enable-vala=yes \
-%if ! 0%{?rhel}
-%ifnarch s390 s390x
- --enable-wimax=yes \
-%endif
-%endif
%if %{regen_docs}
--enable-gtk-doc \
%endif
@@ -327,14 +301,6 @@ fi
%{systemd_dir}/network-online.target.wants/NetworkManager-wait-online.service
%{_datadir}/doc/NetworkManager/examples/server.conf
-%if ! 0%{?rhel}
-%ifnarch s390 s390x
-%files wimax
-%defattr(-,root,root,0755)
-%{_libdir}/%{name}/libnm-device-plugin-wimax.so
-%endif
-%endif
-
%files devel
%defattr(-,root,root,0755)
%doc ChangeLog docs/api/html/*
@@ -382,6 +348,9 @@ fi
%config %{_sysconfdir}/%{name}/conf.d/00-server.conf
%changelog
+* Fri Sep 20 2013 Bill Nottingham <notting at redhat.com> - 0.9.9.0-12.git20130913
+- drop wimax subpackage
+
* Fri Sep 13 2013 Dan Williams <dcbw at redhat.com> - 0.9.9.0-11.git20130913
- core: actually enable ModemManager 1.0 support
- libnm-glib: fix nm_remote_connection_delete() not calling callback (rh #997568)
More information about the scm-commits
mailing list