packages: wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch, w...

[qboosh]

Author: qboosh                       Date: Fri Sep  9 15:36:00 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated generate-libeap-peer patch, package ghost soname symlink
- more verbose files, moved wpa_gui(8) man page to proper subpackage

---- Files affected:
packages/wpa_supplicant:
   wpa_supplicant-0.7.2-generate-libeap-peer.patch (1.2 -> 1.3) , wpa_supplicant.spec (1.81 -> 1.82) 

---- Diffs:

================================================================
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.2 packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch:1.3
--- packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch:1.2	Fri Mar 11 20:48:27 2011
+++ packages/wpa_supplicant/wpa_supplicant-0.7.2-generate-libeap-peer.patch	Fri Sep  9 17:35:55 2011
@@ -42,7 +42,7 @@
 index 3651056..58c067a 100644
 --- a/src/eap_peer/Makefile
 +++ b/src/eap_peer/Makefile
-@@ -1,11 +1,186 @@
+@@ -1,11 +1,187 @@
 -all:
 -	@echo Nothing to be made.
 +LIBEAP_NAME = libeap
@@ -204,7 +204,8 @@
 +	mkdir -p $(DESTDIR)$(LIBDIR)
 +#	copy the lib file to std lib location
 +	cp $(LIBEAP) $(DESTDIR)$(LIBDIR)
-+	ln -fs $(LIBEAP_SO) $(DESTDIR)$(LIBDIR)/$(LIBEAP_NAME).so
++	ln -fs $(LIBEAP) $(DESTDIR)$(LIBDIR)/$(LIBEAP_SO)
++	ln -fs $(LIBEAP) $(DESTDIR)$(LIBDIR)/$(LIBEAP_NAME).so
 +
 +#	copy the headers reqd by apps using eap peer library in its own subfolder under /usr/include
 +	mkdir -p \

================================================================
Index: packages/wpa_supplicant/wpa_supplicant.spec
diff -u packages/wpa_supplicant/wpa_supplicant.spec:1.81 packages/wpa_supplicant/wpa_supplicant.spec:1.82
--- packages/wpa_supplicant/wpa_supplicant.spec:1.81	Sun Mar 27 23:53:06 2011
+++ packages/wpa_supplicant/wpa_supplicant.spec	Fri Sep  9 17:35:55 2011
@@ -1,5 +1,6 @@
 # $Revision$, $Date$
 # TODO:
+# - consider using CONFIG_PRIVSEP
 # - icon for wpa_gui
 # - reverse madwifi bcond when appropriate packages will be available on ftp
 #	/ as of madwifi-ng > r1499 and kernel > 2.6.14 wext driver could be
@@ -202,6 +203,9 @@
 install wpa_supplicant/doc/docbook/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
 install wpa_supplicant/doc/docbook/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
+# program exists with CONFIG_PRIVSEP only
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/wpa_priv.8
+
 %if %{with dbus}
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/dbus-1/system.d,%{_datadir}/dbus-1/system-services}
 install wpa_supplicant/dbus/dbus-wpa_supplicant.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
@@ -222,18 +226,24 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n libeap -p /sbin/ldconfig
-%postun -n libeap -p /sbin/ldconfig
+%post	-n libeap -p /sbin/ldconfig
+%postun	-n libeap -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc wpa_supplicant/{ChangeLog,README,eap_testing.txt,todo.txt}
 %doc wpa_supplicant/{*wpa_supplicant.conf,examples}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
-%attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/eapol_test
+%attr(755,root,root) %{_sbindir}/wpa_cli
+%attr(755,root,root) %{_sbindir}/wpa_passphrase
+%attr(755,root,root) %{_sbindir}/wpa_supplicant
 %attr(750,root,root) %ghost %dir /var/run/%{name}
-%{_mandir}/man[58]/*
+%{_mandir}/man5/wpa_supplicant.conf.5*
+%{_mandir}/man8/wpa_background.8*
+%{_mandir}/man8/wpa_cli.8*
+%{_mandir}/man8/wpa_passphrase.8*
+%{_mandir}/man8/wpa_supplicant.8*
 %if %{with dbus}
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/wpa_supplicant.conf
 %{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
@@ -244,12 +254,14 @@
 %files -n wpa_gui
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/wpa_gui
+%{_mandir}/man8/wpa_gui.8*
 %{_desktopdir}/wpa_gui.desktop
 %endif
 
 %files -n libeap
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libeap.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libeap.so.0
 
 %files -n libeap-devel
 %defattr(644,root,root,755)
@@ -263,6 +275,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.82  2011/09/09 15:35:55  qboosh
+- updated generate-libeap-peer patch, package ghost soname symlink
+- more verbose files, moved wpa_gui(8) man page to proper subpackage
+
 Revision 1.81  2011/03/27 21:53:06  arekm
 - rel 6; build with libnl >= 2.0
 
================================================================

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