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

[megabajt]

Author: megabajt                     Date: Fri Mar 11 19:48:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed libeap installation path on x86_64

---- Files affected:
packages/wpa_supplicant:
   wpa_supplicant.spec (1.77 -> 1.78) , wpa_supplicant-0.7.2-generate-libeap-peer.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/wpa_supplicant/wpa_supplicant.spec
diff -u packages/wpa_supplicant/wpa_supplicant.spec:1.77 packages/wpa_supplicant/wpa_supplicant.spec:1.78
--- packages/wpa_supplicant/wpa_supplicant.spec:1.77	Fri Mar 11 18:32:12 2011
+++ packages/wpa_supplicant/wpa_supplicant.spec	Fri Mar 11 20:48:27 2011
@@ -48,6 +48,7 @@
 BuildRequires:	qt4-qmake
 %endif
 BuildRequires:	readline-devel
+BuildRequires:	sed >= 4.0
 Requires:	rc-scripts >= 0.4.1.24
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -137,6 +138,8 @@
 #patch3 -p0
 %patch4 -p1
 
+%{__sed} -i -e 's, at LIB@,%{_lib},' src/eap_peer/libeap0.pc
+
 install %{SOURCE1} wpa_supplicant/.config
 
 %if %{with dbus}
@@ -205,7 +208,8 @@
 install wpa_supplicant/eapol_test $RPM_BUILD_ROOT%{_bindir}
 
 %{__make} -C src/eap_peer install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	LIBDIR=%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -250,6 +254,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2011/03/11 19:48:27  megabajt
+- fixed libeap installation path on x86_64
+
 Revision 1.77  2011/03/11 17:32:12  megabajt
 - build libeap library (required by wimax)
 - release 3

================================================================
Index: packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch
diff -u packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch:1.1 packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch:1.2
--- packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch:1.1	Fri Mar 11 18:32:12 2011
+++ packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch	Fri Mar 11 20:48:27 2011
@@ -68,7 +68,7 @@
 +CONFIG_TLS=openssl
 +
 +INCLUDE_INSTALL_DIR=/usr/include/eap_peer
-+
++LIBDIR=/usr/lib
 +# Got to use override all across the board, otherwise a 'make
 +# CFLAGS=XX' will kill us because the command line's CFLAGS will
 +# overwrite Make's and we'll loose all the infrastructure it sets.
@@ -201,10 +201,10 @@
 +
 +install: 
 +
-+	mkdir -p $(DESTDIR)/usr/lib
++	mkdir -p $(DESTDIR)$(LIBDIR)
 +#	copy the lib file to std lib location
-+	cp $(LIBEAP) $(DESTDIR)/usr/lib
-+	ln -fs $(LIBEAP_SO) $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so
++	cp $(LIBEAP) $(DESTDIR)$(LIBDIR)
++	ln -fs $(LIBEAP_SO) $(DESTDIR)$(LIBDIR)/$(LIBEAP_NAME).so
 +
 +#	copy the headers reqd by apps using eap peer library in its own subfolder under /usr/include
 +	mkdir -p \
@@ -218,14 +218,14 @@
 +	install -m 0644 $(UTIL_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util
 +	install -m 0644 $(MAIN_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/
 +
-+	mkdir -p $(DESTDIR)/usr/lib/pkgconfig
-+	cp libeap0.pc $(DESTDIR)/usr/lib/pkgconfig
++	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
++	cp libeap0.pc $(DESTDIR)$(LIBDIR)/pkgconfig
 +
 +uninstall: 
 +
-+	rm $(DESTDIR)/usr/lib/$(LIBEAP)
++	rm $(DESTDIR)$(LIBDIR)/$(LIBEAP)
 +	rm -fr $(DESTDIR)/$(INCLUDE_INSTALL_DIR)
-+	rm -f $(DESTDIR)/usr/lib/pkgconfig/libeap0.pc
++	rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/libeap0.pc
  
  clean:
 -	rm -f *~ *.o *.so *.d
@@ -382,7 +382,7 @@
 @@ -0,0 +1,10 @@
 +prefix=/usr
 +exec_prefix=/usr
-+libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@LIB@
 +includedir=${prefix}/include/eap_peer
 +
 +Name: libeap0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpa_supplicant/wpa_supplicant.spec?r1=1.77&r2=1.78&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch?r1=1.1&r2=1.2&f=u