SPECS: courier-authlib.spec - use %service

glen glen at pld-linux.org
Fri Feb 24 12:57:10 CET 2006


Author: glen                         Date: Fri Feb 24 11:57:10 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   courier-authlib.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/courier-authlib.spec
diff -u SPECS/courier-authlib.spec:1.40 SPECS/courier-authlib.spec:1.41
--- SPECS/courier-authlib.spec:1.40	Fri Feb 24 12:42:23 2006
+++ SPECS/courier-authlib.spec	Fri Feb 24 12:57:04 2006
@@ -23,6 +23,7 @@
 BuildRequires:	openldap-devel >= 2.3.0
 BuildRequires:	pam-devel
 BuildRequires:	postgresql-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 BuildRequires:	sysconftool
 BuildRequires:	zlib-devel
@@ -262,19 +263,12 @@
 /sbin/ldconfig %{_libexecdir}/courier-authlib
 /sbin/chkconfig --add courier-authlib
 
-if [ -f /var/lock/subsys/courier-authlib ]; then
-	/etc/rc.d/init.d/courier-authlib restart
-else
-	echo "Run \"/etc/rc.d/init.d/courier-authlib start\" to start authlib daemon"
-fi
+%service courier-authlib restart "authlib daemon"
 
 %preun
 if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del courier-authlib
-
-	if [ -f /var/lock/subsys/courier-authlib ]; then
-		/etc/rc.d/init.d/courier-authlib stop
-	fi
+	%service courier-authlib stop
 fi
 
 %postun
@@ -292,9 +286,7 @@
 	sed -i -e '/^authmodulelist=/{/\bauthldap\b/!s/"$/ authldap"/}' /etc/authlib/authdaemonrc
 fi
 /sbin/ldconfig %{_libexecdir}/courier-authlib
-if [ -f /var/lock/subsys/courier-authlib ]; then
-	/etc/rc.d/init.d/courier-authlib restart
-fi
+%service -q courier-authlib restart
 
 %postun authldap
 if [ "$1" = 0 ]; then
@@ -302,9 +294,7 @@
 	sed -i -e '/^authmodulelist=/{s/ \?\bauthldap\b \?//}' /etc/authlib/authdaemonrc
 fi
 /sbin/ldconfig %{_libexecdir}/courier-authlib
-if [ -f /var/lock/subsys/courier-authlib ]; then
-	/etc/rc.d/init.d/courier-authlib restart
-fi
+%service -q courier-authlib restart
 
 %post authmysql
 if [ "$1" = 1 ]; then
@@ -312,9 +302,7 @@
 	sed -i -e '/^authmodulelist=/{/\bauthmysql\b/!s/"$/ authmysql"/}' /etc/authlib/authdaemonrc
 fi
 /sbin/ldconfig %{_libexecdir}/courier-authlib
-if [ -f /var/lock/subsys/courier-authlib ]; then
-	/etc/rc.d/init.d/courier-authlib restart
-fi
+%service -q courier-authlib restart
 
 %postun authmysql
 if [ "$1" = 0 ]; then
@@ -322,9 +310,7 @@
 	sed -i -e '/^authmodulelist=/{s/ \?\bauthmysql\b \?//}' /etc/authlib/authdaemonrc
 fi
 /sbin/ldconfig %{_libexecdir}/courier-authlib
-if [ -f /var/lock/subsys/courier-authlib ]; then
-	/etc/rc.d/init.d/courier-authlib restart
-fi
+%service -q courier-authlib restart
 
 %post authpgsql
 if [ "$1" = 1 ]; then
@@ -332,9 +318,7 @@
 	sed -i -e '/^authmodulelist=/{/\bauthpgsql\b/!s/"$/ authpgsql"/}' /etc/authlib/authdaemonrc
 fi
 /sbin/ldconfig %{_libexecdir}/courier-authlib
-if [ -f /var/lock/subsys/courier-authlib ]; then
-	/etc/rc.d/init.d/courier-authlib restart
-fi
+%service -q courier-authlib restart
 
 %postun authpgsql
 if [ "$1" = 0 ]; then
@@ -342,9 +326,7 @@
 	sed -i -e '/^authmodulelist=/{s/ \?\bauthpgsql\b \?//}' /etc/authlib/authdaemonrc
 fi
 /sbin/ldconfig %{_libexecdir}/courier-authlib
-if [ -f /var/lock/subsys/courier-authlib ]; then
-	/etc/rc.d/init.d/courier-authlib restart
-fi
+%service -q courier-authlib restart
 
 %post userdb
 if [ "$1" = 1 ]; then
@@ -352,9 +334,7 @@
 	sed -i -e '/^authmodulelist=/{/\buserdb\b/!s/"$/ userdb"/}' /etc/authlib/authdaemonrc
 fi
 /sbin/ldconfig %{_libexecdir}/courier-authlib
-if [ -f /var/lock/subsys/courier-authlib ]; then
-	/etc/rc.d/init.d/courier-authlib restart
-fi
+%service -q courier-authlib restart
 
 %postun userdb
 if [ "$1" = 0 ]; then
@@ -362,9 +342,7 @@
 	sed -i -e '/^authmodulelist=/{s/ \?\buserdb\b \?//}' /etc/authlib/authdaemonrc
 fi
 /sbin/ldconfig %{_libexecdir}/courier-authlib
-if [ -f /var/lock/subsys/courier-authlib ]; then
-	/etc/rc.d/init.d/courier-authlib restart
-fi
+%service -q courier-authlib restart
 
 %post pipe
 if [ "$1" = 1 ]; then
@@ -372,9 +350,7 @@
 	sed -i -e '/^authmodulelist=/{/\bpipe\b/!s/"$/ pipe"/}' /etc/authlib/authdaemonrc
 fi
 /sbin/ldconfig %{_libexecdir}/courier-authlib
-if [ -f /var/lock/subsys/courier-authlib ]; then
-	/etc/rc.d/init.d/courier-authlib restart
-fi
+%service -q courier-authlib restart
 
 %postun pipe
 if [ "$1" = 0 ]; then
@@ -382,9 +358,7 @@
 	sed -i -e '/^authmodulelist=/{s/ \?\bpipe\b \?//}' /etc/authlib/authdaemonrc
 fi
 /sbin/ldconfig %{_libexecdir}/courier-authlib
-if [ -f /var/lock/subsys/courier-authlib ]; then
-	/etc/rc.d/init.d/courier-authlib restart
-fi
+%service -q courier-authlib restart
 
 %post -n openldap-schema-courier
 if ! grep -q %{schemadir}/courier.schema /etc/openldap/slapd.conf; then
@@ -400,10 +374,7 @@
 		}
 	' /etc/openldap/slapd.conf
 fi
-
-if [ -f /var/lock/subsys/ldap ]; then
-	/etc/rc.d/init.d/ldap restart >&2
-fi
+%service -q ldap restart
 
 %postun -n openldap-schema-courier
 if [ "$1" = "0" ]; then
@@ -416,9 +387,7 @@
 		' /etc/openldap/slapd.conf
 	fi
 
-	if [ -f /var/lock/subsys/ldap ]; then
-		/etc/rc.d/init.d/ldap restart >&2 || :
-	fi
+	%service -q ldap restart
 fi
 
 %triggerin -- courier < 0.48
@@ -435,7 +404,7 @@
 	if [ -f /var/spool/courier/authdaemon/pid ]; then
 		kill `cat /var/spool/courier/authdaemon/pid`
 		rm -f /var/spool/courier/authdaemon/*
-		/etc/rc.d/init.d/courier-authlib start
+		/sbin/service courier-authlib start
 	fi
 fi
 
@@ -453,7 +422,7 @@
 	if [ -f /var/lib/authdaemon/pid ]; then
 		kill `cat /var/lib/authdaemon/pid`
 		rm -f /var/lib/authdaemon/*
-		/etc/rc.d/init.d/courier-authlib start
+		/sbin/service courier-authlib start
 	fi
 fi
 
@@ -471,7 +440,7 @@
 	if [ -f /var/spool/sqwebmail/authdaemon/pid ]; then
 		kill `cat /var/spool/sqwebmail/authdaemon/pid`
 		rm -f /var/spool/sqwebmail/authdaemon/*
-		/etc/rc.d/init.d/courier-authlib start
+		/sbin/service courier-authlib start
 	fi
 fi
 
@@ -479,81 +448,63 @@
 if [ -f /etc/courier/authldaprc ]; then
 	mv -f /etc/authlib/authldaprc /etc/authlib/authldaprc.new
 	cp -f /etc/courier/authldaprc /etc/authlib/authldaprc
-	if [ -f /var/lock/subsys/courier-authlib ]; then
-		/etc/rc.d/init.d/courier-authlib restart
-	fi
+	%service -q courier-authlib restart
 fi
 
 %triggerin -n %{name}-authldap -- courier-imap-authldap < 4.0.0
 if [ -f /etc/courier-imap/authldaprc ]; then
 	mv -f /etc/authlib/authldaprc /etc/authlib/authldaprc.new
 	cp -f /etc/courier-imap/authldaprc /etc/authlib/authldaprc
-	if [ -f /var/lock/subsys/courier-authlib ]; then
-		/etc/rc.d/init.d/courier-authlib restart
-	fi
+	%service -q courier-authlib restart
 fi
 
 %triggerin -n %{name}-authldap -- sqwebmail-auth-ldap < 5.0.0
 if [ -f /etc/sqwebmail/authldaprc ]; then
 	mv -f /etc/authlib/authldaprc /etc/authlib/authldaprc.new
 	cp -f /etc/sqwebmail/authldaprc /etc/authlib/authldaprc
-	if [ -f /var/lock/subsys/courier-authlib ]; then
-		/etc/rc.d/init.d/courier-authlib restart
-	fi
+	%service -q courier-authlib restart
 fi
 
 %triggerin -n %{name}-authmysql -- courier-authmysql < 0.48
 if [ -f /etc/courier/authmysqlrc ]; then
 	mv -f /etc/authlib/authmysqlrc /etc/authlib/authmysqlrc.new
 	cp -f /etc/courier/authmysqlrc /etc/authlib/authmysqlrc
-	if [ -f /var/lock/subsys/courier-authlib ]; then
-		/etc/rc.d/init.d/courier-authlib restart
-	fi
+	%service -q courier-authlib restart
 fi
 
 %triggerin -n %{name}-authmysql -- courier-imap-authmysql < 4.0.0
 if [ -f /etc/courier-imap/authmysqlrc ]; then
 	mv -f /etc/authlib/authmysqlrc /etc/authlib/authmysqlrc.new
 	cp -f /etc/courier-imap/authmysqlrc /etc/authlib/authmysqlrc
-	if [ -f /var/lock/subsys/courier-authlib ]; then
-		/etc/rc.d/init.d/courier-authlib restart
-	fi
+	%service -q courier-authlib restart
 fi
 
 %triggerin -n %{name}-authmysql -- sqwebmail-auth-mysql < 5.0.0
 if [ -f /etc/sqwebmail/authmysqlrc ]; then
 	mv -f /etc/authlib/authmysqlrc /etc/authlib/authmysqlrc.new
 	cp -f /etc/sqwebmail/authmysqlrc /etc/authlib/authmysqlrc
-	if [ -f /var/lock/subsys/courier-authlib ]; then
-		/etc/rc.d/init.d/courier-authlib restart
-	fi
+	%service -q courier-authlib restart
 fi
 
 %triggerin -n %{name}-authpgsql -- courier-authpgsql < 0.48
 if [ -f /etc/courier/authpgsqlrc ]; then
 	mv -f /etc/authlib/authpgsqlrc /etc/authlib/authpgsqlrc.new
 	cp -f /etc/courier/authpgsqlrc /etc/authlib/authpgsqlrc
-	if [ -f /var/lock/subsys/courier-authlib ]; then
-		/etc/rc.d/init.d/courier-authlib restart
-	fi
+	%service -q courier-authlib restart
 fi
 
 %triggerin -n %{name}-authpgsql -- courier-imap-authpgsql < 4.0.0
 if [ -f /etc/courier-imap/authpgsqlrc ]; then
 	mv -f /etc/authlib/authpgsqlrc /etc/authlib/authpgsqlrc.new
 	cp -f /etc/courier-imap/authpgsqlrc /etc/authlib/authpgsqlrc
-	if [ -f /var/lock/subsys/courier-authlib ]; then
-		/etc/rc.d/init.d/courier-authlib restart
-	fi
+	%service -q courier-authlib restart
 fi
 
 %triggerin -n %{name}-authpgsql -- sqwebmail-auth-pgsql < 5.0.0
 if [ -f /etc/sqwebmail/authpgsqlrc ]; then
 	mv -f /etc/authlib/authpgsqlrc /etc/authlib/authpgsqlrc.new
 	cp -f /etc/sqwebmail/authpgsqlrc /etc/authlib/authpgsqlrc
-	if [ -f /var/lock/subsys/courier-authlib ]; then
-		/etc/rc.d/init.d/courier-authlib restart
-	fi
+	%service -q courier-authlib restart
 fi
 
 %triggerin -n %{name}-userdb -- courier < 0.48
@@ -675,6 +626,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2006/02/24 11:57:04  glen
+- use %service
+
 Revision 1.40  2006/02/24 11:42:23  glen
 - separate libcourierauth.so into -libs
 - adapterized, rel 4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/courier-authlib.spec?r1=1.40&r2=1.41&f=u



More information about the pld-cvs-commit mailing list