packages: wpa_supplicant/wpa_supplicant.spec, wpa_supplicant/wpa_supplicant...

[arekm]

Author: arekm                        Date: Sat Sep 17 07:27:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 8; build with new libnl

---- Files affected:
packages/wpa_supplicant:
   wpa_supplicant.spec (1.83 -> 1.84) , wpa_supplicant-nl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/wpa_supplicant/wpa_supplicant.spec
diff -u packages/wpa_supplicant/wpa_supplicant.spec:1.83 packages/wpa_supplicant/wpa_supplicant.spec:1.84
--- packages/wpa_supplicant/wpa_supplicant.spec:1.83	Sat Sep 17 09:07:53 2011
+++ packages/wpa_supplicant/wpa_supplicant.spec	Sat Sep 17 09:27:50 2011
@@ -21,7 +21,7 @@
 Summary(pl.UTF-8):	Suplikant WPA/WPA2/RSN/IEEE 802.1X dla Linuksa
 Name:		wpa_supplicant
 Version:	0.7.3
-Release:	7
+Release:	8
 License:	GPL v2
 Group:		Networking
 Source0:	http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -36,6 +36,7 @@
 Patch4:		%{name}-0.7.2-generate-libeap-peer.patch
 Patch5:		dbus-services.patch
 Patch6:		bss-changed-prop-notify.patch
+Patch7:		%{name}-nl.patch
 URL:		http://hostap.epitest.fi/wpa_supplicant/
 %{?with_dbus:BuildRequires:	dbus-devel}
 BuildRequires:	libnl-devel >= 1:2.0
@@ -141,6 +142,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__sed} -i -e 's, at LIB@,%{_lib},' src/eap_peer/libeap0.pc
 
@@ -160,8 +162,8 @@
 %{__make} -C wpa_supplicant \
 	V=1 \
 	CC="%{__cc}" \
-	LDFLAGS="%{rpmldflags}" \
-	OPTCFLAGS="%{rpmcppflags} %{rpmcflags}"
+	LDFLAGS="%{rpmldflags} `pkg-config --libs libnl-3.0 libnl-genl-3.0`" \
+	OPTCFLAGS="%{rpmcppflags} %{rpmcflags} `pkg-config --cflags libnl-3.0`"
 
 # eapol_test:
 %{__make} -C wpa_supplicant eapol_test \
@@ -275,6 +277,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2011/09/17 07:27:50  arekm
+- rel 8; build with new libnl
+
 Revision 1.83  2011/09/17 07:07:53  arekm
 - release 7
 

================================================================
Index: packages/wpa_supplicant/wpa_supplicant-nl.patch
diff -u /dev/null packages/wpa_supplicant/wpa_supplicant-nl.patch:1.1
--- /dev/null	Sat Sep 17 09:27:56 2011
+++ packages/wpa_supplicant/wpa_supplicant-nl.patch	Sat Sep 17 09:27:50 2011
@@ -0,0 +1,13 @@
+--- wpa_supplicant-0.7.3/src/drivers/drivers.mak~	2010-09-07 17:43:39.000000000 +0200
++++ wpa_supplicant-0.7.3/src/drivers/drivers.mak	2011-09-17 09:25:24.005139544 +0200
+@@ -31,10 +31,8 @@
+ NEED_AP_MLME=y
+ NEED_NETLINK=y
+ NEED_LINUX_IOCTL=y
+-DRV_LIBS += -lnl
+ 
+ ifdef CONFIG_LIBNL20
+-DRV_LIBS += -lnl-genl
+ DRV_CFLAGS += -DCONFIG_LIBNL20
+ endif
+ endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpa_supplicant/wpa_supplicant.spec?r1=1.83&r2=1.84&f=u