SPECS: cyrus-sasl.spec - pure chkconfig dep, use %service, rel 2

[glen]

Author: glen                         Date: Tue Aug  1 08:52:39 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- pure chkconfig dep, use %service, rel 2

---- Files affected:
SPECS:
   cyrus-sasl.spec (1.153 -> 1.154) 

---- Diffs:

================================================================
Index: SPECS/cyrus-sasl.spec
diff -u SPECS/cyrus-sasl.spec:1.153 SPECS/cyrus-sasl.spec:1.154
--- SPECS/cyrus-sasl.spec:1.153	Sat May 27 13:28:13 2006
+++ SPECS/cyrus-sasl.spec	Tue Aug  1 10:52:34 2006
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-#
 # TODO:
 # - add ldap plugin from openldap sources
 #
@@ -27,7 +26,7 @@
 Summary(uk):	âŚÂĚŚĎÔĹËÁ Cyrus SASL
 Name:		cyrus-sasl
 Version:	2.1.22
-Release:	1
+Release:	2
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
@@ -58,6 +57,7 @@
 %{?with_opie:BuildRequires:	opie-devel}
 BuildRequires:	pam-devel
 %{?with_pgsql:BuildRequires:	postgresql-devel}
+BuildRequires:	rpmbuild(macros) >= 1.268
 %{?with_sqlite:BuildRequires:	sqlite-devel}
 Requires:	pam >= 0.79.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -351,6 +351,7 @@
 Group:		Daemons
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}-%{release}
+Requires:	/sbin/chkconfig
 Requires:	rc-scripts
 
 %description saslauthd
@@ -530,17 +531,11 @@
 
 %post saslauthd
 /sbin/chkconfig --add saslauthd
-if [ -f /var/lock/subsys/saslauthd ]; then
-	/etc/rc.d/init.d/saslauthd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/saslauthd start\" to start saslauthd."
-fi
+%service saslauthd restart
 
 %preun saslauthd
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/saslauthd ]; then
-		/etc/rc.d/init.d/saslauthd stop 1>&2
-	fi
+	%service saslauthd stop
 	/sbin/chkconfig --del saslauthd
 fi
 
@@ -669,6 +664,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.154  2006/08/01 08:52:34  glen
+- pure chkconfig dep, use %service, rel 2
+
 Revision 1.153  2006/05/27 11:28:13  qboosh
 - updated to 2.1.22, updated gcc4 patch, removed obsolete configdir patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cyrus-sasl.spec?r1=1.153&r2=1.154&f=u