SPECS (AC-branch): em8300.spec - use %service

glen glen at pld-linux.org
Mon Oct 22 21:37:09 CEST 2007


Author: glen                         Date: Mon Oct 22 19:37:09 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use %service

---- Files affected:
SPECS:
   em8300.spec (1.49.2.12 -> 1.49.2.13) 

---- Diffs:

================================================================
Index: SPECS/em8300.spec
diff -u SPECS/em8300.spec:1.49.2.12 SPECS/em8300.spec:1.49.2.13
--- SPECS/em8300.spec:1.49.2.12	Mon Oct 15 10:26:44 2007
+++ SPECS/em8300.spec	Mon Oct 22 21:37:04 2007
@@ -46,9 +46,10 @@
 %endif
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
-BuildRequires:	rpmbuild(macros) >= 1.308
 %endif
+BuildRequires:	rpmbuild(macros) >= 1.308
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 Provides:	dxr3
 Obsoletes:	em8300-libs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -164,7 +165,7 @@
 		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	%{__make} -C %{_kernelsrcdir} modules \
-	        CC="%{__cc}" CPP="%{__cpp}" \
+			CC="%{__cc}" CPP="%{__cpp}" \
 		SYSSRC=%{_kernelsrcdir} \
 		SYSOUT=$PWD/o \
 		M=$PWD O=$PWD/o \
@@ -206,17 +207,11 @@
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/%{name} start\" to load %{name} modules."
-fi
+%service %{name} restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/%{name} ]; then
-		/etc/rc.d/init.d/%{name} stop 1>&2
-	fi
+	%service stop
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -278,6 +273,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49.2.13  2007/10/22 19:37:04  glen
+- use %service
+
 Revision 1.49.2.12  2007/10/15 08:26:44  glen
 - rel 55 (kernel 2.6.16.55)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/em8300.spec?r1=1.49.2.12&r2=1.49.2.13&f=u



More information about the pld-cvs-commit mailing list