[NetworkManager/f17] disable WiMAX plugin on s390(x)
Dan Horák
sharkcz at fedoraproject.org
Thu Mar 1 21:55:24 UTC 2012
commit 0bc44360ffd83d4e491e96aaa60b5a2ad4b5bc38
Author: Dan Horák <dan at danny.cz>
Date: Thu Mar 1 22:55:21 2012 +0100
disable WiMAX plugin on s390(x)
NetworkManager.spec | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 3d65688..7d13c0c 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -21,7 +21,7 @@ Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
Version: 0.9.3
-Release: 0.2%{snapshot}%{?dist}
+Release: 0.3%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@@ -93,9 +93,9 @@ BuildRequires: libudev-devel
BuildRequires: libuuid-devel
BuildRequires: libgudev1-devel >= 143
BuildRequires: desktop-file-utils
-BuildRequires: wimax-devel
-# No bluetooth on s390
+# No wimax or bluetooth on s390
%ifnarch s390 s390x
+BuildRequires: wimax-devel
BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
%endif
BuildRequires: systemd systemd-devel
@@ -112,6 +112,7 @@ It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE devices, and
provides VPN integration with a variety of different VPN services.
+%ifnarch s390 s390x
%package wimax
Summary: Intel WiMAX device support for NetworkManager
Group: System Environment/Base
@@ -121,6 +122,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
%description wimax
This package contains NetworkManager support for Intel WiMAX mobile broadband
devices.
+%endif
%package devel
@@ -232,7 +234,9 @@ intltoolize --force
--with-dhcpcd=no \
--with-crypto=nss \
--enable-more-warnings=yes \
+%ifnarch s390 s390x
--enable-wimax=yes \
+%endif
--enable-polkit=yes \
--with-session-tracking=systemd \
--with-docs=yes \
@@ -414,9 +418,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{systemd_dir}/NetworkManager-wait-online.service
%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
+%ifnarch s390 s390x
%files wimax
%defattr(-,root,root,0755)
%{_libdir}/%{name}/libnm-device-plugin-wimax.so
+%endif
%files devel
%defattr(-,root,root,0755)
@@ -490,6 +496,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/libnm-gtk.so
%changelog
+* Thu Mar 1 2012 Dan Horák <dan[at]danny.cz> - 0.9.3-0.3
+- disable WiMAX plugin on s390(x)
+
* Thu Feb 16 2012 Dan Williams <dcbw at redhat.com> - 0.9.3-0.2
- Put WiMAX plugin files in the right subpackage
More information about the scm-commits
mailing list