SPECS: linux-wlan.spec - use %service

glen glen at pld-linux.org
Thu Apr 20 18:30:53 CEST 2006


Author: glen                         Date: Thu Apr 20 16:30:53 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   linux-wlan.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/linux-wlan.spec
diff -u SPECS/linux-wlan.spec:1.15 SPECS/linux-wlan.spec:1.16
--- SPECS/linux-wlan.spec:1.15	Tue Dec 13 12:54:17 2005
+++ SPECS/linux-wlan.spec	Thu Apr 20 18:30:48 2006
@@ -10,6 +10,7 @@
 # Source0-md5:	47fb22cb5ca497eaa6bc51eed2056929
 Patch0:		%{name}.pld.patch
 URL:		http://www.linux-wlan.com/
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	pcmcia-cs
 ExcludeArch:	sparc sparc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -46,17 +47,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/pcmcia ]; then
-	/etc/rc.d/init.d/pcmcia restart 2> /dev/null
-else
-	echo "Run \"/rc.d/init.d/pcmcia start\" to start pcmcia cardbus daemon."
-fi
+%service pcmcia restart "pcmcia cardbus daemon"
 
 %postun
 if [ "$1" = "0" ]; then
-	if [ -f /var/state/run/pcmcia ]; then
-		/etc/rc.d/init.d/pcmcia restart 2> /dev/null
-	fi
+	%service pcmcia restart
 fi
 
 %files
@@ -76,6 +71,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/04/20 16:30:48  glen
+- use %service
+
 Revision 1.15  2005/12/13 11:54:17  glen
 - adalterized (sorted %verify flags)
 
@@ -86,7 +84,7 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.12  2002/08/18 13:39:08  blues
-one more license fix
+- one more license fix
 
 Revision 1.11  2002/08/18 13:31:45  blues
 - release 5 - license fix
@@ -105,7 +103,7 @@
   Group field using gettext).
 
 Revision 1.6  2002/01/18 02:13:44  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.5  2002/01/08 15:14:01  qboosh
 - changed Requires: pcmcia-cs to Prereq, don't call chkconfig for pcmcia; release 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/linux-wlan.spec?r1=1.15&r2=1.16&f=u



More information about the pld-cvs-commit mailing list