SPECS: web-cyradm.spec - %service requires rpmbuild(macros) >= 1.2...

[glen]

Author: glen                         Date: Wed Aug 24 11:16:24 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- %service requires rpmbuild(macros) >= 1.228
- %service already includes check for sybsys lock

---- Files affected:
SPECS:
   web-cyradm.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/web-cyradm.spec
diff -u SPECS/web-cyradm.spec:1.3 SPECS/web-cyradm.spec:1.4
--- SPECS/web-cyradm.spec:1.3	Wed Aug 24 11:11:20 2005
+++ SPECS/web-cyradm.spec	Wed Aug 24 13:16:17 2005
@@ -19,6 +19,7 @@
 Patch0:		%{name}-locale.patch
 # Source0-md5:	d06dc16899680c29b94a5460709b5fe0
 URL:		http://www.web-cyradm.org/
+BuildRequires:	rpmbuild(macros) >= 1.228
 Requires:	apache
 Requires:	php
 Requires:	php-gettext
@@ -106,9 +107,7 @@
 if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then
 	ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf
 
-	if [ -f /var/lock/subsys/httpd ]; then
-		%service -q httpd restart
-	fi
+	%service -q httpd reload
 fi
 
 %preun
@@ -117,9 +116,7 @@
 	if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then
 		rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf
 
-		if [ -f /var/lock/subsys/httpd ]; then
-		    %service -q httpd restart
-		fi
+		%service -q httpd reload
 	fi
 fi
 
@@ -138,6 +135,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/08/24 11:16:17  glen
+- %service requires rpmbuild(macros) >= 1.228
+- %service already includes check for sybsys lock
+
 Revision 1.3  2005/08/24 09:11:20  kosmo
 - R & BR changes
 - better /etc/httpd/web-cyradm.conf
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.3&r2=1.4&f=u