SPECS: slmodem.spec - use %service, fix chkconfig deps

glen glen at pld-linux.org
Thu Apr 20 19:41:02 CEST 2006


Author: glen                         Date: Thu Apr 20 17:41:02 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service, fix chkconfig deps

---- Files affected:
SPECS:
   slmodem.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/slmodem.spec
diff -u SPECS/slmodem.spec:1.18 SPECS/slmodem.spec:1.19
--- SPECS/slmodem.spec:1.18	Wed Apr 12 14:15:40 2006
+++ SPECS/slmodem.spec	Thu Apr 20 19:40:57 2006
@@ -33,7 +33,9 @@
 URL:		http://www.smlink.com/
 BuildRequires:	%{kgcc_package}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build}
-BuildRequires:	rpmbuild(macros) >= 1.118
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -218,17 +220,11 @@
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon." >&2
-fi
+%service %{name} restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/%{name} ]; then
-		/etc/rc.d/init.d/%{name} stop
-	fi
+	%service %{name} stop
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -268,6 +264,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/04/20 17:40:57  glen
+- use %service, fix chkconfig deps
+
 Revision 1.18  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/slmodem.spec?r1=1.18&r2=1.19&f=u



More information about the pld-cvs-commit mailing list