SPECS: Zope-Hotfix.spec, Zope-I18NLayer.spec, Zope-LinguaPlone.spe...

glen glen at pld-linux.org
Thu Mar 23 20:27:33 CET 2006 

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

---- Files affected:
SPECS:
   Zope-Hotfix.spec (1.2 -> 1.3) , Zope-I18NLayer.spec (1.9 -> 1.10) , Zope-LinguaPlone.spec (1.5 -> 1.6) , Zope-LocalFS.spec (1.11 -> 1.12) , Zope-Localizer.spec (1.24 -> 1.25) , Zope-OrderedFolderSupportPatch.spec (1.8 -> 1.9) , Zope-PlacelessTranslationService.spec (1.9 -> 1.10) , Zope-PloneExFile.spec (1.4 -> 1.5) , Zope-PloneLanguageTool.spec (1.10 -> 1.11) , Zope-PloneLoginHistory.spec (1.5 -> 1.6) , Zope-PortalTransport.spec (1.7 -> 1.8) , Zope-Silva.spec (1.25 -> 1.26) , Zope-TimerService.spec (1.11 -> 1.12) , Zope-TranslationService.spec (1.12 -> 1.13) , Zope-WebMail.spec (1.14 -> 1.15) , Zope-ZAAPlugins.spec (1.2 -> 1.3) , Zope-ZAttachmentAttribute.spec (1.4 -> 1.5) , Zope-ZMySQLDA.spec (1.17 -> 1.18) , Zope-ZPhotoSlides.spec (1.9 -> 1.10) , Zope-ZSyncer.spec (1.8 -> 1.9) , Zope-ZWiki.spec (1.36 -> 1.37) , Zope-ZopeScheduler.spec (1.7 -> 1.8) , Zope-archetypes.spec (1.39 -> 1.40) , Zope-epoz.spec (1.9 -> 1.10) , Zope-exUserFolder.spec (1.7 -> 1.8) , Zope-fcForum.spec (1.13 -> 1.14) , Zope-iHotfix.spec (1.17 -> 1.18) , Zope-kupu.spec (1.3 -> 1.4) , Zope-stripogram.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/Zope-Hotfix.spec
diff -u SPECS/Zope-Hotfix.spec:1.2 SPECS/Zope-Hotfix.spec:1.3
--- SPECS/Zope-Hotfix.spec:1.2	Tue Jun 14 10:48:19 2005
+++ SPECS/Zope-Hotfix.spec	Thu Mar 23 20:27:26 2006
@@ -12,8 +12,9 @@
 URL:		http://www.zope.org/Products/Zope/Hotfix-2005-04-05/announce-Hotfix_20050405/
 BuildRequires:	python
 %pyrequires_eq	python-modules
-Requires:	Zope
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,postun):	/usr/sbin/installzopeproduct
+Requires:	Zope
 Obsoletes:	Zope-Hotfix = 040713
 Obsoletes:	Zope-Hotfix = 040714
 BuildArch:	noarch
@@ -46,16 +47,12 @@
 
 %post
 /usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+%service -q zope restart
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/installzopeproduct -d %{zope_subname}
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope restart >&2
-	fi
+	%service -q zope restart
 fi
 
 %files
@@ -70,6 +67,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2006/03/23 19:27:26  glen
+- use %service
+
 Revision 1.2  2005/06/14 08:48:19  ankry
 - renamed from Zope-hotfix050405.spec
 

================================================================
Index: SPECS/Zope-I18NLayer.spec
diff -u SPECS/Zope-I18NLayer.spec:1.9 SPECS/Zope-I18NLayer.spec:1.10
--- SPECS/Zope-I18NLayer.spec:1.9	Thu Nov  3 21:15:43 2005
+++ SPECS/Zope-I18NLayer.spec	Thu Mar 23 20:27:26 2006
@@ -12,11 +12,12 @@
 # Source0-md5:	63097d2b464724c381afd3d598233994
 URL:		http://plone.org/Members/longsleep/I18NLayer/
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 %pyrequires_eq	python-modules
 Requires:	Zope
 Requires:	Zope-CMFPlone
-Requires:	Zope-archetypes
 Requires:	Zope-PloneLanguageTool
+Requires:	Zope-archetypes
 
 Requires(post,postun):	/usr/sbin/installzopeproduct
 BuildArch:	noarch
@@ -51,16 +52,12 @@
 
 %post
 /usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+%service -q zope restart
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/installzopeproduct -d %{zope_subname}
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope restart >&2
-	fi
+	%service -q zope restart
 fi
 
 %files
@@ -74,6 +71,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/03/23 19:27:26  glen
+- use %service
+
 Revision 1.9  2005/11/03 20:15:43  glen
 - unify sf url, and other things that adapter felt neccessary
 

================================================================
Index: SPECS/Zope-LinguaPlone.spec
diff -u SPECS/Zope-LinguaPlone.spec:1.5 SPECS/Zope-LinguaPlone.spec:1.6
--- SPECS/Zope-LinguaPlone.spec:1.5	Thu Jan 13 07:39:55 2005
+++ SPECS/Zope-LinguaPlone.spec	Thu Mar 23 20:27:26 2006
@@ -10,13 +10,14 @@
 Source0:	http://dl.sourceforge.net/collective/%{zope_subname}-%{version}.tar.gz
 # Source0-md5:	ec534fe349301a5bbf577b5cfcdf5a6a
 URL:		http://sourceforge.net/projects/collective/
-Requires(post,postun):	/usr/sbin/installzopeproduct
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,postun):	/usr/sbin/installzopeproduct
 %pyrequires_eq	python-modules
 Requires:	Zope
-Requires:	Zope-archetypes >= 1.3
-Requires:	Zope-PloneLanguageTool >= 0.5
 Requires:	Zope-CMFPlone >= 2.0.3
+Requires:	Zope-PloneLanguageTool >= 0.5
+Requires:	Zope-archetypes >= 1.3
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,16 +49,12 @@
 
 %post
 /usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+%service -q zope restart
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/installzopeproduct -d %{zope_subname}
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope restart >&2
-	fi
+	%service -q zope restart
 fi
 
 %files
@@ -71,6 +68,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/03/23 19:27:26  glen
+- use %service
+
 Revision 1.5  2005/01/13 06:39:55  ankry
 - spaces -> tabs
 

================================================================
Index: SPECS/Zope-LocalFS.spec
diff -u SPECS/Zope-LocalFS.spec:1.11 SPECS/Zope-LocalFS.spec:1.12
--- SPECS/Zope-LocalFS.spec:1.11	Wed Feb 23 16:18:59 2005
+++ SPECS/Zope-LocalFS.spec	Thu Mar 23 20:27:26 2006
@@ -12,9 +12,10 @@
 # Source0-md5:	0196bdc5df0797cd33f5297b5a52c2f8
 URL:		http://www.easyleading.org/Members/Eddy/LocalFS-1.6-andreas/
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 %pyrequires_eq	python-modules
-Requires:	Zope
 Requires(post,postun):	/usr/sbin/installzopeproduct
+Requires:	Zope
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -45,16 +46,12 @@
 
 %post
 /usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+%service -q zope restart
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/installzopeproduct -d %{zope_subname}
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope restart >&2
-	fi
+	%service -q zope restart
 fi
 
 %files
@@ -68,6 +65,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2006/03/23 19:27:26  glen
+- use %service
+
 Revision 1.11  2005/02/23 15:18:59  ciesiel
 - upgraded to version 1.6
 

================================================================
Index: SPECS/Zope-Localizer.spec
diff -u SPECS/Zope-Localizer.spec:1.24 SPECS/Zope-Localizer.spec:1.25
--- SPECS/Zope-Localizer.spec:1.24	Mon Jun 27 17:19:46 2005
+++ SPECS/Zope-Localizer.spec	Thu Mar 23 20:27:26 2006
@@ -12,11 +12,12 @@
 # Source0-md5:	ab6f95886f3475387078966780438083
 URL:		http://www.localizer.org/
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 %pyrequires_eq	python-modules
+Requires(post,postun):	/usr/sbin/installzopeproduct
 Requires:	Zope >= 2.7
-Requires:	python-itools >= 0.9.2
 Requires:	Zope-iHotfix >= 0.5.2
-Requires(post,postun):	/usr/sbin/installzopeproduct
+Requires:	python-itools >= 0.9.2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,16 +48,12 @@
 
 %post
 /usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+%service -q zope restart
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/installzopeproduct -d %{zope_subname}
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope restart >&2
-	fi
+	%service -q zope restart
 fi
 
 %files
@@ -72,6 +69,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2006/03/23 19:27:26  glen
+- use %service
+
 Revision 1.24  2005/06/27 15:19:46  ciesiel
 - upgraded to version 1.1.1
 

================================================================
Index: SPECS/Zope-OrderedFolderSupportPatch.spec
diff -u SPECS/Zope-OrderedFolderSupportPatch.spec:1.8 SPECS/Zope-OrderedFolderSupportPatch.spec:1.9
--- SPECS/Zope-OrderedFolderSupportPatch.spec:1.8	Thu Jan 13 07:39:55 2005
+++ SPECS/Zope-OrderedFolderSupportPatch.spec	Thu Mar 23 20:27:26 2006
@@ -9,8 +9,9 @@
 Group:		Development/Tools
 Source0:	OrderedFolderSupportPatch.tar.gz
 URL:		http://www.nuxeo.org
-Requires(post,postun):	/usr/sbin/installzopeproduct
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,postun):	/usr/sbin/installzopeproduct
 %pyrequires_eq	python-modules
 Requires:	Zope >= 2.6
 BuildArch:	noarch
@@ -43,16 +44,12 @@
 
 %post
 /usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+%service -q zope restart
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/installzopeproduct -d %{zope_subname}
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope restart >&2
-	fi
+	%service -q zope restart
 fi
 
 %files
@@ -66,6 +63,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/03/23 19:27:26  glen
+- use %service
+
 Revision 1.8  2005/01/13 06:39:55  ankry
 - spaces -> tabs
 

================================================================
Index: SPECS/Zope-PlacelessTranslationService.spec
diff -u SPECS/Zope-PlacelessTranslationService.spec:1.9 SPECS/Zope-PlacelessTranslationService.spec:1.10
--- SPECS/Zope-PlacelessTranslationService.spec:1.9	Sat Feb 25 21:33:13 2006
+++ SPECS/Zope-PlacelessTranslationService.spec	Thu Mar 23 20:27:26 2006
@@ -11,6 +11,7 @@
 # Source0-md5:	c081dcc7379478e5dd9500419b2d557a
 URL:		http://plone.org/products/pts/
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 %pyrequires_eq	python-modules
 Requires(post,postun):	/usr/sbin/installzopeproduct
 Requires:	Zope
@@ -48,16 +49,12 @@
 
 %post
 /usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+%service -q zope restart
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/installzopeproduct -d %{zope_subname}
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope restart >&2
-	fi
+	%service -q zope restart
 fi
 
 %files
@@ -71,6 +68,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/03/23 19:27:26  glen
+- use %service
+
 Revision 1.9  2006/02/25 20:33:13  ciesiel
 - upgraded to version 1.2.6
 

================================================================
Index: SPECS/Zope-PloneExFile.spec
diff -u SPECS/Zope-PloneExFile.spec:1.4 SPECS/Zope-PloneExFile.spec:1.5
--- SPECS/Zope-PloneExFile.spec:1.4	Sat Aug  6 09:36:29 2005
+++ SPECS/Zope-PloneExFile.spec	Thu Mar 23 20:27:26 2006
@@ -10,10 +10,11 @@
 Source0:	http://dl.sourceforge.net/ingeniweb/%{zope_subname}-%{version}.tar.gz
 # Source0-md5:	3e23b7fe5e365bfad5ba3dcfa753ab85
 URL:		http://sourceforge.net/projects/ingeniweb/
+BuildRequires:	rpmbuild(macros) >= 1.268
 %pyrequires_eq	python-modules
+Requires(post,postun):	/usr/sbin/installzopeproduct
 Requires:	Zope
 Requires:	Zope-ZAttachmentAttribute >= 2.0
-Requires(post,postun):	/usr/sbin/installzopeproduct
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -41,16 +42,12 @@
 
 %post
 /usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+%service -q zope restart
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/installzopeproduct -d %{zope_subname}
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope restart >&2
-	fi
+	%service -q zope restart
 fi
 
 %files
@@ -64,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/03/23 19:27:26  glen
+- use %service
+
 Revision 1.4  2005/08/06 07:36:29  ciesiel
 - upgraded to version 3.02
 

================================================================
Index: SPECS/Zope-PloneLanguageTool.spec
diff -u SPECS/Zope-PloneLanguageTool.spec:1.10 SPECS/Zope-PloneLanguageTool.spec:1.11
--- SPECS/Zope-PloneLanguageTool.spec:1.10	Wed Jan  4 06:24:53 2006
+++ SPECS/Zope-PloneLanguageTool.spec	Thu Mar 23 20:27:26 2006
@@ -11,6 +11,7 @@
 # Source0-md5:	385425aa6f392d1d15de2d98e928e688
 URL:		http://plone.org/Members/longsleep/I18NLayer/
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 %pyrequires_eq	python-modules
 Requires:	Zope
 Requires:	Zope-CMFPlone
@@ -45,16 +46,12 @@
 
 %post
 /usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+%service -q zope restart
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/installzopeproduct -d %{zope_subname}
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope restart >&2
-	fi
+	%service -q zope restart
 fi
 
 %files
@@ -68,6 +65,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/03/23 19:27:26  glen
+- use %service
+
 Revision 1.10  2006/01/04 05:24:53  ciesiel
 - upgraded to version 0.9
 

================================================================
Index: SPECS/Zope-PloneLoginHistory.spec
diff -u SPECS/Zope-PloneLoginHistory.spec:1.5 SPECS/Zope-PloneLoginHistory.spec:1.6
--- SPECS/Zope-PloneLoginHistory.spec:1.5	Thu Jan 13 07:39:56 2005
+++ SPECS/Zope-PloneLoginHistory.spec	Thu Mar 23 20:27:26 2006
@@ -7,11 +7,12 @@
 Release:	3
 License:	GPL
 Group:		Development/Tools
-Source0:	http://www.easyleading.org/Downloads/PloneLoginHistory-0.2.0.tar.gz
+Source0:	http://www.easyleading.org/Downloads/PloneLoginHistory-%{version}.tar.gz
 # Source0-md5:	52bd599d7cd77d408c13fbf6c35e9da8
 URL:		http://www.easyleading.org/Products/PloneLoginHistory/
-Requires(post,postun):	/usr/sbin/installzopeproduct
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,postun):	/usr/sbin/installzopeproduct
 %pyrequires_eq	python-modules
 Requires:	Zope
 Requires:	Zope-CMF >= 1:1.4.2
@@ -44,16 +45,12 @@
 
 %post
 /usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+%service -q zope restart
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/installzopeproduct -d %{zope_subname}
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope restart >&2
-	fi
+	%service -q zope restart
 fi
 
 %files
@@ -67,6 +64,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/03/23 19:27:26  glen
+- use %service
+
 Revision 1.5  2005/01/13 06:39:56  ankry
 - spaces -> tabs
 

================================================================
Index: SPECS/Zope-PortalTransport.spec
diff -u SPECS/Zope-PortalTransport.spec:1.7 SPECS/Zope-PortalTransport.spec:1.8
--- SPECS/Zope-PortalTransport.spec:1.7	Thu Jan 13 07:39:56 2005
+++ SPECS/Zope-PortalTransport.spec	Thu Mar 23 20:27:26 2006
@@ -11,8 +11,9 @@
 # Source0-md5:	a461fbee5442e1d29af623a9d9bcbfbb
 Patch0:		%{name}-Interface.patch
 URL:		http://sourceforge.net/projects/collective/
-Requires(post,postun):	/usr/sbin/installzopeproduct
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,postun):	/usr/sbin/installzopeproduct
 %pyrequires_eq	python-modules
 Requires:	Zope
 Requires:	Zope-CMF >= 1:1.4.2
@@ -50,16 +51,12 @@
 
 %post
 /usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+%service -q zope restart
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/installzopeproduct -d %{zope_subname}
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope restart >&2
-	fi
+	%service -q zope restart
 fi
 
 %files
@@ -73,6 +70,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/03/23 19:27:26  glen
+- use %service
+
 Revision 1.7  2005/01/13 06:39:56  ankry
 - spaces -> tabs
 

================================================================
Index: SPECS/Zope-Silva.spec
diff -u SPECS/Zope-Silva.spec:1.25 SPECS/Zope-Silva.spec:1.26
--- SPECS/Zope-Silva.spec:1.25	Thu Nov 24 06:49:48 2005
+++ SPECS/Zope-Silva.spec	Thu Mar 23 20:27:26 2006
@@ -13,13 +13,14 @@
 URL:		http://www.infrae.com/products/silva/
 BuildRequires:	python
 %pyrequires_eq	python-modules
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,postun):	/usr/sbin/installzopeproduct
 Requires:	Zope >= 2.6.1
-Requires:	Zope-kupu >= 1.3.1
 Requires:	Zope-FileSystemSite >= 1.4.2
 Requires:	Zope-Formulator >= 1.10
 Requires:	Zope-PlacelessTranslationService
+Requires:	Zope-kupu >= 1.3.1
 Requires:	python-PyXML >= 0.8.3
-Requires(post,postun):	/usr/sbin/installzopeproduct
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,7 +35,6 @@
 %prep
 %setup -q -c
 
-%build
 # remove dirs - additional packages!
 rm -rf {Formulator,FileSystemSite,PlacelessTranslationService,kupu}
 
@@ -72,18 +72,14 @@
 for p in Annotations ParsedXML ProxyIndex Silva SilvaDocument SilvaMetadata SilvaViews Sprout XMLWidgets; do
 	/usr/sbin/installzopeproduct %{_datadir}/%{name}/$p
 done
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+%service -q zope restart
 
 %postun
 if [ "$1" = "0" ]; then
 	for p in Annotations ParsedXML ProxyIndex Silva SilvaDocument SilvaMetadata SilvaViews Sprout XMLWidgets; do
 		/usr/sbin/installzopeproduct -d $p
 	done
-fi
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
+	%service -q zope restart
 fi
 
 %files
@@ -97,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/03/23 19:27:26  glen
+- use %service
+
 Revision 1.25  2005/11/24 05:49:48  ciesiel
 - upgraded to version 1.4.1
 

================================================================
Index: SPECS/Zope-TimerService.spec
diff -u SPECS/Zope-TimerService.spec:1.11 SPECS/Zope-TimerService.spec:1.12
--- SPECS/Zope-TimerService.spec:1.11	Thu Jan 13 07:39:56 2005
+++ SPECS/Zope-TimerService.spec	Thu Mar 23 20:27:26 2006
@@ -14,10 +14,11 @@
 Source1:	Zope-timerserver_remover
 URL:		http://dev.legco.biz/products/timerservice/
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 %pyrequires_eq	python-modules
+Requires(post,postun):	/usr/sbin/installzopeproduct
 Requires:	Zope
 Requires:	perl-modules
-Requires(post,postun):	/usr/sbin/installzopeproduct
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -58,25 +59,22 @@
 %post
 /usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
 
-# ln -s %{py_sitedir}/%{module} /usr/lib/zope/lib/python/timerserver
-
-echo "%import timerserver" >> /etc/zope/main/zope.conf
-echo "<timer-server>" >> /etc/zope/main/zope.conf
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/Zope-Hotfix.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/Zope-I18NLayer.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/Zope-LinguaPlone.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/Zope-LocalFS.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/Zope-Localizer.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/SPECS/Zope-OrderedFolderSupportPatch.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/Zope-PlacelessTranslationService.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/Zope-PloneExFile.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/Zope-PloneLanguageTool.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/Zope-PloneLoginHistory.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/Zope-PortalTransport.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/Zope-Silva.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/Zope-TimerService.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/Zope-TranslationService.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/Zope-WebMail.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/Zope-ZAAPlugins.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/Zope-ZAttachmentAttribute.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/Zope-ZMySQLDA.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/Zope-ZPhotoSlides.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/Zope-ZSyncer.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/Zope-ZWiki.spec?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/SPECS/Zope-ZopeScheduler.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/Zope-archetypes.spec?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/SPECS/Zope-epoz.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/Zope-exUserFolder.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/Zope-fcForum.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/Zope-iHotfix.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/Zope-kupu.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/Zope-stripogram.spec?r1=1.5&r2=1.6&f=u

More information about the pld-cvs-commit mailing list