packages (DEVEL): NetworkManager/NetworkManager.spec - reverted adapter cha...

[kiesiu]

Author: kiesiu                       Date: Wed Apr  6 08:45:59 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- reverted adapter change and corrected formatting (thanks to glen)
- created with bcond for wimax

---- Files affected:
packages/NetworkManager:
   NetworkManager.spec (1.76.2.5 -> 1.76.2.6) 

---- Diffs:

================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.76.2.5 packages/NetworkManager/NetworkManager.spec:1.76.2.6
--- packages/NetworkManager/NetworkManager.spec:1.76.2.5	Tue Apr  5 16:50:50 2011
+++ packages/NetworkManager/NetworkManager.spec	Wed Apr  6 10:45:54 2011
@@ -1,5 +1,10 @@
 # $Revision$, $Date$
+
+# Conditional build
+%bcond_with	wimax	# enable wimax support
+
 %define		ppp_version	2.4.5
+
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
@@ -36,7 +41,7 @@
 BuildRequires:	sed >= 4.0
 BuildRequires:	udev-devel
 BuildRequires:	udev-glib-devel >= 147
-#BuildRequires:	wimax-devel >= 1.5.1
+%{?with_wimax:BuildRequires:	wimax-devel >= 1.5.1}
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	ConsoleKit
@@ -131,13 +136,13 @@
 	--with-distro=pld \
 	--enable-more-warnings=yes \
 	--with-dhclient=/sbin/dhclient \
-	--with-iptables=%{_sbindir}/iptables \
+	--with-iptables=/usr/sbin/iptables \
 	--with-system-ca-path=/etc/certs \
 	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
 	--with-dist-version=%{version}-%{release} \
 	--with-docs \
-	--enable-static \
-    --disable-wimax
+	%{__enable_disable wimax} \
+	--enable-static
 
 %{__make}
 
@@ -263,6 +268,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76.2.6  2011/04/06 08:45:54  kiesiu
+- reverted adapter change and corrected formatting (thanks to glen)
+- created with bcond for wimax
+
 Revision 1.76.2.5  2011/04/05 14:50:50  kiesiu
 - updated to 0.8.998
 - updated BRs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager.spec?r1=1.76.2.5&r2=1.76.2.6&f=u