SPECS: wpa_supplicant.spec - removed init.d/sysconfig files - didn...

adamg adamg at pld-linux.org
Wed May 10 19:08:08 CEST 2006


Author: adamg                        Date: Wed May 10 17:08:08 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed init.d/sysconfig files - didn't know that rc-scripts have builtin
  support for wpa_supplicant

---- Files affected:
SPECS:
   wpa_supplicant.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/wpa_supplicant.spec
diff -u SPECS/wpa_supplicant.spec:1.29 SPECS/wpa_supplicant.spec:1.30
--- SPECS/wpa_supplicant.spec:1.29	Wed May 10 12:05:38 2006
+++ SPECS/wpa_supplicant.spec	Wed May 10 19:08:02 2006
@@ -24,8 +24,6 @@
 # Source0-md5:	a73b5b1be3f20f3e2c4d325f0a7a38e4
 Source1:	%{name}.config
 Source2:	%{name}-wpa_gui.desktop
-Source3:	%{name}.init
-Source4:	%{name}.sysconfig
 Patch0:		%{name}-makefile.patch
 Patch1:		%{name}-0.4.7_dscape-02.patch
 URL:		http://hostap.epitest.fi/wpa_supplicant/
@@ -37,8 +35,6 @@
 BuildRequires:	qt-devel
 %endif
 BuildRequires:	readline-devel
-Requires(post,preun):	/sbin/chkconfig
-Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -124,18 +120,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_mandir}/man{5,8},%{_bindir},%{_desktopdir},/var/run/%{name}} \
-	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
-
+install -d $RPM_BUILD_ROOT{%{_mandir}/man{5,8},%{_bindir},%{_desktopdir},/var/run/%{name}}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install doc/docbook/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
 install doc/docbook/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-
 %if %{with gui}
 install wpa_gui/wpa_gui $RPM_BUILD_ROOT%{_bindir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/wpa_gui.desktop
@@ -144,21 +135,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/chkconfig --add %{name}
-
-%preun
-if [ "$1" = "0" ]; then
-	%service %{name} stop
-	/sbin/chkconfig --del %{name}
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README eap_testing.txt todo.txt
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(755,root,root) %{_sbindir}/*
 %attr(750,root,root) %dir /var/run/%{name}
 %{_mandir}/man[58]/*
@@ -176,6 +156,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2006/05/10 17:08:02  adamg
+- removed init.d/sysconfig files - didn't know that rc-scripts have builtin
+  support for wpa_supplicant
+
 Revision 1.29  2006/05/10 10:05:38  adamg
 - include sysconfig and init files
 - cosmetics, adapterized
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/wpa_supplicant.spec?r1=1.29&r2=1.30&f=u



More information about the pld-cvs-commit mailing list