From 3ab8a0adf1d59c1be2e09f309889013e5b2b98a5 Mon Sep 17 00:00:00 2001 From: Daniel Mach Date: Tue, 25 Jun 2013 16:32:58 +0200 Subject: [PATCH] Disable WiMax for RHEL --- NetworkManager.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index 0d50e64..4783873 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -23,7 +23,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.9.9.0 -Release: 3%{snapshot}%{?dist} +Release: 4%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -88,9 +88,11 @@ 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 %if 0%{?fedora} && 0%{?fedora} < 17 # systemd.pc is in systemd-units for F16 and below @@ -104,6 +106,7 @@ 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 @@ -115,6 +118,7 @@ Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} This package contains NetworkManager support for Intel WiMAX mobile broadband devices. %endif +%endif %package devel @@ -178,9 +182,11 @@ NetworkManager functionality from applications that use glib. --enable-more-warnings=yes \ --enable-ppp=yes \ --enable-vala=yes \ +%if ! 0%{?rhel} %ifnarch s390 s390x --enable-wimax=yes \ %endif +%endif %if %{regen_docs} --enable-gtk-doc \ %endif @@ -311,11 +317,13 @@ exit 0 %{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) @@ -360,6 +368,9 @@ exit 0 %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Tue Jun 25 2013 Jiří Klimeš - 0.9.9.0-4.git20130603 +- disable building WiMax for RHEL + * Mon Jun 3 2013 Dan Williams - 0.9.9.0-3.git20130603 - Update to new 0.9.10 snapshot