SPECS: Zope3-psycopgda.spec, Zope3-zwiki.spec - use %service

[glen]

Author: glen                         Date: Thu Mar 23 19:29:45 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   Zope3-psycopgda.spec (1.4 -> 1.5) , Zope3-zwiki.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/Zope3-psycopgda.spec
diff -u SPECS/Zope3-psycopgda.spec:1.4 SPECS/Zope3-psycopgda.spec:1.5
--- SPECS/Zope3-psycopgda.spec:1.4	Thu Oct  6 15:47:24 2005
+++ SPECS/Zope3-psycopgda.spec	Thu Mar 23 20:29:40 2006
@@ -12,6 +12,7 @@
 Patch0:		%{name}-python_ver.patch
 URL:		http://www.zope.org/Products/Zope3-Packages/psycopgda/view
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,postun):	/usr/sbin/installzope3package
 Requires(post,postun):	rc-scripts
 %pyrequires_eq	python-modules
@@ -57,16 +58,12 @@
 
 %post
 /usr/sbin/installzope3package %{zope_subname}
-if [ -f /var/lock/subsys/zope3 ]; then
-	/etc/rc.d/init.d/zope3 restart >&2
-fi
+%service -q zope3 restart
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/installzope3package -d %{zope_subname}
-	if [ -f /var/lock/subsys/zope3 ]; then
-		/etc/rc.d/init.d/zope3 restart >&2
-	fi
+	%service -q zope3 restart
 fi
 
 %files
@@ -80,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/03/23 19:29:40  glen
+- use %service
+
 Revision 1.4  2005/10/06 13:47:24  jajcus
 - allow building Zope3-psycopgda with Python 2.4.2
 

================================================================
Index: SPECS/Zope3-zwiki.spec
diff -u SPECS/Zope3-zwiki.spec:1.2 SPECS/Zope3-zwiki.spec:1.3
--- SPECS/Zope3-zwiki.spec:1.2	Tue Dec 20 23:35:07 2005
+++ SPECS/Zope3-zwiki.spec	Thu Mar 23 20:29:40 2006
@@ -11,6 +11,7 @@
 # Source0-md5:	7a469eb4c313c40c89a4e0a47da27e8e
 URL:		http://www.zope.org/DevHome/Wikis/DevSite/Projects/ComponentArchitecture/ZwikiForZope3
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,postun):	/usr/sbin/installzope3package
 %pyrequires_eq	python-modules
 Requires:	Zope3
@@ -40,8 +41,8 @@
 install -d $RPM_BUILD_ROOT%{_var}/spool/%{name}/{tmp,new,cur}
 
 python install.py install \
-        --root="$RPM_BUILD_ROOT" \
-        --install-purelib="%{zope_pyscriptdir}"
+	--root="$RPM_BUILD_ROOT" \
+	--install-purelib="%{zope_pyscriptdir}"
 
 mv $RPM_BUILD_ROOT%{_prefix}/zopeskel $RPM_BUILD_ROOT%{_sysconfdir}/zope3
 
@@ -56,16 +57,12 @@
 
 %post
 %{_sbindir}/installzope3package %{zope_pyscriptdir}/%{zope_subname} %{zope_subname}
-if [ -f /var/lock/subsys/zope3 ]; then
-	/etc/rc.d/init.d/zope3 restart >&2
-fi
+%service -q zope3 restart
 
 %postun
 if [ "$1" = "0" ]; then
 	%{_sbindir}/installzope3package -d %{zope_subname}
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope restart >&2
-	fi
+	%service -q zope3 restart
 fi
 
 %files
@@ -81,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2006/03/23 19:29:40  glen
+- use %service
+
 Revision 1.2  2005/12/20 22:35:07  arekm
 - according to zope3 naming guidelines all packages and module names should be lowercase
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/Zope3-psycopgda.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/Zope3-zwiki.spec?r1=1.2&r2=1.3&f=u