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

[glen]

Author: glen                         Date: Thu Apr 20 17:43:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service, fix chkconfig deps, fix broken %preun, strict internal deps

---- Files affected:
SPECS:
   soundmodem.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/soundmodem.spec
diff -u SPECS/soundmodem.spec:1.5 SPECS/soundmodem.spec:1.6
--- SPECS/soundmodem.spec:1.5	Fri Aug 12 10:02:25 2005
+++ SPECS/soundmodem.spec	Thu Apr 20 19:43:10 2006
@@ -14,6 +14,9 @@
 BuildRequires:	automake
 BuildRequires:	gtk+-devel
 BuildRequires:	libxml-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,7 +34,7 @@
 Summary:	GUI for soundmodem configuration
 Summary(pl):	Graficzny interfejs do konfiguracji soundmodemu
 Group:		X11/Applications
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description X11
 GUI interface for soundmodem.
@@ -69,17 +72,11 @@
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/%{name} start\" to start %{name}." 1>&2
-fi
+%service %{name} restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/%{name} ]; then
-		/etc/rc.d/init.d/%{name} stop >&2
-fi
+	%service %{name} stop
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -102,6 +99,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/04/20 17:43:10  glen
+- use %service, fix chkconfig deps, fix broken %preun, strict internal deps
+
 Revision 1.5  2005/08/12 08:02:25  blekot
 - up to 0.9
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/soundmodem.spec?r1=1.5&r2=1.6&f=u