SPECS: binfmt-detector.spec - use %service

[darekr]

Author: darekr                       Date: Mon May  1 15:42:37 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   binfmt-detector.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/binfmt-detector.spec
diff -u SPECS/binfmt-detector.spec:1.1 SPECS/binfmt-detector.spec:1.2
--- SPECS/binfmt-detector.spec:1.1	Mon May  1 17:02:42 2006
+++ SPECS/binfmt-detector.spec	Mon May  1 17:42:31 2006
@@ -9,6 +9,7 @@
 Source0:	http://team.pld-linux.org/~wolf/%{name}.tar.gz
 # Source0-md5:	11623bddbeb536e88c47c8a1aedc9189
 Source1:	%{name}.init
+BuildRequires:	rpmbuild(macros) >= 1.268
 Conflicts:	wine <= 1:0.9.12-1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -41,27 +42,23 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/rc.d/init.d}
+install -d $RPM_BUILD_ROOT{%{_bindir},/etc/rc.d/init.d}
 
 install binfmt-detector-cli $RPM_BUILD_ROOT%{_bindir}
 install binfmt-detector.sh $RPM_BUILD_ROOT%{_bindir}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/binfmt-detector
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/binfmt-detector
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add binfmt-detector
-if [ ! -f /var/lock/subsys/binfmt-detector ]; then
-	echo "Run \"/etc/rc.d/init.d/binfmt-detector start\" to start binfmt-detector service." >&2
-fi
+%service binfmt-detector restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/binfmt-detector ]; then
-		/etc/rc.d/init.d/binfmt-detector stop >&2
-	fi
+	%service binfmt-detector stop
 	/sbin/chkconfig --del binfmt-detector
 fi
 
@@ -69,7 +66,7 @@
 %defattr(644,root,root,755)
 %doc README
 %attr(755,root,root) %{_bindir}/*
-%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/binfmt-detector
+%attr(754,root,root) /etc/rc.d/init.d/binfmt-detector
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -77,6 +74,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2006/05/01 15:42:31  darekr
+- use %service
+
 Revision 1.1  2006/05/01 15:02:42  wolf
 - new
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/binfmt-detector.spec?r1=1.1&r2=1.2&f=u