SPECS: Zope-BTreeFolder2.spec, Zope-CMF.spec, Zope-CMFBoard.spec, ...

glen glen at pld-linux.org
Sun Mar 19 19:38:18 CET 2006 

Author: glen                         Date: Sun Mar 19 18:38:18 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   Zope-BTreeFolder2.spec (1.13 -> 1.14) , Zope-CMF.spec (1.27 -> 1.28) , Zope-CMFBoard.spec (1.17 -> 1.18) , Zope-CMFCollector.spec (1.28 -> 1.29) , Zope-CMFContentPanels.spec (1.15 -> 1.16) , Zope-CMFForum.spec (1.21 -> 1.22) , Zope-CMFMPoll.spec (1.7 -> 1.8) , Zope-CMFMessage.spec (1.6 -> 1.7) , Zope-CMFPhoto.spec (1.19 -> 1.20) , Zope-CMFPhotoAlbum.spec (1.19 -> 1.20) , Zope-CMFPlone.spec (1.50 -> 1.51) , Zope-CMFPloneWebMail.spec (1.6 -> 1.7) , Zope-CMFPortalContentFolder.spec (1.6 -> 1.7) , Zope-CMFQuickInstallerTool.spec (1.27 -> 1.28) , Zope-CMFSin.spec (1.17 -> 1.18) , Zope-CMFVisualEditor.spec (1.14 -> 1.15) , Zope-COREBlog.spec (1.21 -> 1.22) , Zope-COREBlog2.spec (1.1 -> 1.2) , Zope-CPSSkins.spec (1.29 -> 1.30) , Zope-CPSSkinsTutorial.spec (1.5 -> 1.6) , Zope-CookieCrumbler.spec (1.11 -> 1.12) , Zope-Epoz.spec (1.18 -> 1.19) , Zope-ExtFile.spec (1.13 -> 1.14) , Zope-ExternalEditor.spec (1.21 -> 1.22) , Zope-FSDump.spec (1.10 -> 1.11) , Zope-FileSystemSite.spec (1.8 -> 1.9) , Zope-Formulator.spec (1.30 -> 1.31) , Zope-GroupUserFolder.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/Zope-BTreeFolder2.spec
diff -u SPECS/Zope-BTreeFolder2.spec:1.13 SPECS/Zope-BTreeFolder2.spec:1.14
--- SPECS/Zope-BTreeFolder2.spec:1.13	Sat Oct  8 13:48:49 2005
+++ SPECS/Zope-BTreeFolder2.spec	Sun Mar 19 19:38:11 2006
@@ -11,9 +11,10 @@
 # Source0-md5:	ff9ac5d485ca2a9d4f65e85509c88f2e
 URL:		http://hathawaymix.org/Software/BTreeFolder2/
 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)
 
@@ -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
+	/usr/sbin/installzopeproduct -d %{zope_subname}
+	%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.14  2006/03/19 18:38:11  glen
+- use %service
+
 Revision 1.13  2005/10/08 11:48:49  ciesiel
 - upgrade to version 1.0.2
 

================================================================
Index: SPECS/Zope-CMF.spec
diff -u SPECS/Zope-CMF.spec:1.27 SPECS/Zope-CMF.spec:1.28
--- SPECS/Zope-CMF.spec:1.27	Thu Nov 24 06:27:38 2005
+++ SPECS/Zope-CMF.spec	Sun Mar 19 19:38:11 2006
@@ -13,8 +13,9 @@
 URL:		http://cmf.zope.org/
 BuildRequires:	python
 %pyrequires_eq	python-modules
-Requires:	Zope >= 2.7.7
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,postun):	/usr/sbin/installzopeproduct
+Requires:	Zope >= 2.7.7
 Obsoletes:	CMF
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -63,18 +64,14 @@
 for p in CMFActionIcons CMFCalendar CMFCore CMFDefault CMFSetup CMFTopic CMFUid DCWorkflow ; 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 CMFActionIcons CMFCalendar CMFCore CMFDefault CMFSetup CMFTopic CMFUid DCWorkflow ; 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
@@ -88,6 +85,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2006/03/19 18:38:11  glen
+- use %service
+
 Revision 1.27  2005/11/24 05:27:38  ciesiel
 - upgraded to version 1.5.5
 

================================================================
Index: SPECS/Zope-CMFBoard.spec
diff -u SPECS/Zope-CMFBoard.spec:1.17 SPECS/Zope-CMFBoard.spec:1.18
--- SPECS/Zope-CMFBoard.spec:1.17	Mon Jun 27 16:43:38 2005
+++ SPECS/Zope-CMFBoard.spec	Sun Mar 19 19:38:11 2006
@@ -10,23 +10,24 @@
 Source0:	http://dl.sourceforge.net/collective/%{zope_subname}-%{version}.tar.gz
 # Source0-md5:	c9e758f81525e49a89871ba79af61588
 URL:		http://www.cmfboard.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
 Requires:	Zope-BTreeFolder2
 Requires:	Zope-CMF
-Requires:	Zope-CMFPlone >= 2.0
 Requires:	Zope-CMFMessage
+Requires:	Zope-CMFPlone >= 2.0
 Requires:	Zope-PlacelessTranslationService
 Requires:	Zope-PortalTransport
 Requires:	Zope-archetypes >= 1.2.5
 Requires:	python-Imaging
 Requires:	python-PyXML
-BuildArch:	noarch
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Conflicts:	CMF
 Conflicts:	Plone
+BuildArch:	noarch
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Portal discussion for Plone.
@@ -58,16 +59,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
@@ -81,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/03/19 18:38:11  glen
+- use %service
+
 Revision 1.17  2005/06/27 14:43:38  ciesiel
 - upgraded to version 2.2.1
 

================================================================
Index: SPECS/Zope-CMFCollector.spec
diff -u SPECS/Zope-CMFCollector.spec:1.28 SPECS/Zope-CMFCollector.spec:1.29
--- SPECS/Zope-CMFCollector.spec:1.28	Thu Jan 13 07:39:55 2005
+++ SPECS/Zope-CMFCollector.spec	Sun Mar 19 19:38:11 2006
@@ -11,13 +11,14 @@
 # Source0-md5:	742fc8c28c073311b00b5104ff75c26f
 URL:		http://zope.org/Members/bowerymarc/CMFCollector-update/
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 %pyrequires_eq	python-modules
-Requires:	Zope-CMF >= 1:1.4
-Requires:	Zope >= 2.4
 Requires(post,postun):	/usr/sbin/installzopeproduct
+Requires:	Zope >= 2.4
+Requires:	Zope-CMF >= 1:1.4
+Conflicts:	CMF
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Conflicts:	CMF
 
 %description
 CMFCollector is an issue collector for Zope.
@@ -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.29  2006/03/19 18:38:11  glen
+- use %service
+
 Revision 1.28  2005/01/13 06:39:55  ankry
 - spaces -> tabs
 
@@ -88,7 +88,7 @@
 - spaces->tabs
 
 Revision 1.22  2004/07/28 08:03:20  troll
-- removed %%include /usr/lib/rpm/macros.python
+- removed %include /usr/lib/rpm/macros.python
 
 Revision 1.21  2004/03/24 08:18:58  ciesiel
 - cleanup

================================================================
Index: SPECS/Zope-CMFContentPanels.spec
diff -u SPECS/Zope-CMFContentPanels.spec:1.15 SPECS/Zope-CMFContentPanels.spec:1.16
--- SPECS/Zope-CMFContentPanels.spec:1.15	Sat Nov 19 00:04:42 2005
+++ SPECS/Zope-CMFContentPanels.spec	Sun Mar 19 19:38:11 2006
@@ -11,16 +11,17 @@
 Source0:	http://plone.org/products/cmfcontentpanels/releases/%{version}/contentpanels-2_0.tgz
 # Source0-md5:	95e2e17255faca6f1122fc64723074b2
 URL:		http://www.zopechina.com/products-en/CMFContentPanels/
-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
 Requires:	Zope-CMFPlone
-BuildArch:	noarch
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Conflicts:	CMF
 Conflicts:	Plone
+BuildArch:	noarch
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 A CMF/Plone portlets product.
@@ -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.16  2006/03/19 18:38:11  glen
+- use %service
+
 Revision 1.15  2005/11/18 23:04:42  ciesiel
 - upgraded to version 2.0
 

================================================================
Index: SPECS/Zope-CMFForum.spec
diff -u SPECS/Zope-CMFForum.spec:1.21 SPECS/Zope-CMFForum.spec:1.22
--- SPECS/Zope-CMFForum.spec:1.21	Thu Jan 13 07:39:55 2005
+++ SPECS/Zope-CMFForum.spec	Sun Mar 19 19:38:11 2006
@@ -11,13 +11,14 @@
 # Source0-md5:	dc9ee26b8c78a32238afd2540dcf258c
 URL:		http://sourceforge.net/projects/collective/
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 %pyrequires_eq	python-modules
+Requires(post,postun):	/usr/sbin/installzopeproduct
 Requires:	Zope >= 2.5.1
 Requires:	Zope-CMF >= 1:1.4
-Requires(post,postun):	/usr/sbin/installzopeproduct
+Conflicts:	CMF
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Conflicts:	CMF
 
 %description
 CMMForum is a Zope product - Anonymous can post by default but can't
@@ -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.22  2006/03/19 18:38:11  glen
+- use %service
+
 Revision 1.21  2005/01/13 06:39:55  ankry
 - spaces -> tabs
 

================================================================
Index: SPECS/Zope-CMFMPoll.spec
diff -u SPECS/Zope-CMFMPoll.spec:1.7 SPECS/Zope-CMFMPoll.spec:1.8
--- SPECS/Zope-CMFMPoll.spec:1.7	Thu Jan 13 07:39:55 2005
+++ SPECS/Zope-CMFMPoll.spec	Sun Mar 19 19:38:11 2006
@@ -10,15 +10,16 @@
 Source0:	http://dl.sourceforge.net/collective/%{zope_subname}-%{version}.tar.gz
 # Source0-md5:	bc8dd0f835e51a16a421e550bb4667f3
 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
 Requires:	Zope-archetypes
+Conflicts:	CMF
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Conflicts:	CMF
 
 %description
 Sime cookie-based poll product based on Archetypes.
@@ -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.8  2006/03/19 18:38:11  glen
+- use %service
+
 Revision 1.7  2005/01/13 06:39:55  ankry
 - spaces -> tabs
 

================================================================
Index: SPECS/Zope-CMFMessage.spec
diff -u SPECS/Zope-CMFMessage.spec:1.6 SPECS/Zope-CMFMessage.spec:1.7
--- SPECS/Zope-CMFMessage.spec:1.6	Thu Jan 13 07:39:55 2005
+++ SPECS/Zope-CMFMessage.spec	Sun Mar 19 19:38:11 2006
@@ -10,8 +10,9 @@
 Source0:	http://dl.sourceforge.net/collective/%{zope_subname}-1_1.tgz
 # Source0-md5:	fc38580a86005cf2781504ea9a400ec3
 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
@@ -27,8 +28,6 @@
 %prep
 %setup -q -c
 find . -type f -name *.pyc | xargs rm -rf
-
-%build
 mkdir docs docs/CMFMessage docs/CMFUserTrackTool docs/UserTrack
 mv -f CMFMessage/{AUTHORS,INSTALL,README} docs/CMFMessage
 mv -f CMFUserTrackTool/{AUTHORS,readme.txt} docs/CMFUserTrackTool
@@ -54,18 +53,14 @@
 for p in CMFMessage CMFUserTrackTool UserTrack ; 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 CMFMessage CMFUserTrackTool UserTrack ; 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
@@ -79,6 +74,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/03/19 18:38:11  glen
+- use %service
+
 Revision 1.6  2005/01/13 06:39:55  ankry
 - spaces -> tabs
 
@@ -89,7 +87,7 @@
 - release 2 for rebuild with python 2.4
 
 Revision 1.3  2004/07/28 08:03:20  troll
-- removed %%include /usr/lib/rpm/macros.python
+- removed %include /usr/lib/rpm/macros.python
 
 Revision 1.2  2004/01/27 08:31:16  ciesiel
 - upgraded to version 1.1

================================================================
Index: SPECS/Zope-CMFPhoto.spec
diff -u SPECS/Zope-CMFPhoto.spec:1.19 SPECS/Zope-CMFPhoto.spec:1.20
--- SPECS/Zope-CMFPhoto.spec:1.19	Thu Jan 13 07:39:55 2005
+++ SPECS/Zope-CMFPhoto.spec	Sun Mar 19 19:38:11 2006
@@ -12,16 +12,17 @@
 # Source0-md5:	b175ab4acf27fde98c61c03698ed1cbf
 URL:		http://sourceforge.net/projects/collective/
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 %pyrequires_eq	python-modules
-Requires:	Zope-CMF >= 1:1.4
+Requires(post,postun):	/usr/sbin/installzopeproduct
 Requires:	ImageMagick
-Requires:	Zope-CMFPlone >= 1.0.1
 Requires:	Zope >= 2.6.1
-Requires(post,postun):	/usr/sbin/installzopeproduct
-BuildArch:	noarch
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:	Zope-CMF >= 1:1.4
+Requires:	Zope-CMFPlone >= 1.0.1
 Conflicts:	CMF
 Conflicts:	Plone
+BuildArch:	noarch
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 CMFPhoto is a Zope product with wrapper objects and a Plone skin for
@@ -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.20  2006/03/19 18:38:11  glen
+- use %service
+
 Revision 1.19  2005/01/13 06:39:55  ankry
 - spaces -> tabs
 
@@ -90,7 +90,7 @@
 - spaces->tabs
 
 Revision 1.14  2004/07/28 08:03:20  troll
-- removed %%include /usr/lib/rpm/macros.python
+- removed %include /usr/lib/rpm/macros.python
 
 Revision 1.13  2004/01/27 08:37:38  ciesiel
 - upgraded to version 0.4rc2

================================================================
Index: SPECS/Zope-CMFPhotoAlbum.spec
diff -u SPECS/Zope-CMFPhotoAlbum.spec:1.19 SPECS/Zope-CMFPhotoAlbum.spec:1.20
--- SPECS/Zope-CMFPhotoAlbum.spec:1.19	Thu Jan 13 07:39:55 2005
+++ SPECS/Zope-CMFPhotoAlbum.spec	Sun Mar 19 19:38:11 2006
@@ -12,17 +12,18 @@
 # Source0-md5:	5b1157ccdbd7638495481db8c3aefcbe
 URL:		http://sourceforge.net/projects/collective/
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 %pyrequires_eq	python-modules
-Requires:	Zope-CMF >= 1:1.4
-Requires:	Zope-CMFPlone >= 1.0.1
+Requires(post,postun):	/usr/sbin/installzopeproduct
 Requires:	Zope >= 2.6.1
 Requires:	Zope-BTreeFolder2 >= 0.5
+Requires:	Zope-CMF >= 1:1.4
 Requires:	Zope-CMFPhoto
-Requires(post,postun):	/usr/sbin/installzopeproduct
-BuildArch:	noarch
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:	Zope-CMFPlone >= 1.0.1
 Conflicts:	CMF
 Conflicts:	Plone
+BuildArch:	noarch
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 CMFPhotoAlbum is a Zope product that provides Photo Album in your CMF.
@@ -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.20  2006/03/19 18:38:11  glen
+- use %service
+
 Revision 1.19  2005/01/13 06:39:55  ankry
 - spaces -> tabs
 

================================================================
Index: SPECS/Zope-CMFPlone.spec
diff -u SPECS/Zope-CMFPlone.spec:1.50 SPECS/Zope-CMFPlone.spec:1.51
--- SPECS/Zope-CMFPlone.spec:1.50	Fri Jan 20 22:43:05 2006
+++ SPECS/Zope-CMFPlone.spec	Sun Mar 19 19:38:11 2006
@@ -8,30 +8,31 @@
 Release:	1
 License:	Zope Public License (ZPL), GPL
 Group:		Networking/Daemons
-Source0:	http://puzzle.dl.sourceforge.net/plone/Plone-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/plone/Plone-%{version}.tar.gz
 # Source0-md5:	72989893b6cd012a5d26eccc5aa2576b
 URL:		http://www.plone.org/
 BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 %pyrequires_eq	python-modules
-Requires:	i18ndude
-Requires:	python-Imaging
-Requires:	Zope-archetypes >= 1.3.7
-Requires:	Zope-kupu >= 1.3.3
-Requires:	Zope-CMF >= 1:1.5.5
+Requires(post,postun):	/usr/sbin/installzopeproduct
 Requires:	Zope >= 2.7.7
 Requires:	Zope-BTreeFolder2 >= 1.0.2
+Requires:	Zope-CMF >= 1:1.5.5
 Requires:	Zope-CMFQuickInstallerTool >= 1.5.7
 Requires:	Zope-ExternalEditor >= 0.9.1
 Requires:	Zope-Formulator >= 1.6.2
 Requires:	Zope-GroupUserFolder >= 1:3.5
 Requires:	Zope-PlacelessTranslationService >= 1.2.1
 Requires:	Zope-PloneLanguageTool >= 0.9
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/Zope-BTreeFolder2.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMF.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFBoard.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFCollector.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFContentPanels.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFForum.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFMPoll.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFMessage.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFPhoto.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFPhotoAlbum.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFPlone.spec?r1=1.50&r2=1.51&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFPloneWebMail.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFPortalContentFolder.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFQuickInstallerTool.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFSin.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CMFVisualEditor.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/Zope-COREBlog.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/Zope-COREBlog2.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CPSSkins.spec?r1=1.29&r2=1.30&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CPSSkinsTutorial.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/Zope-CookieCrumbler.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/Zope-Epoz.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/Zope-ExtFile.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/Zope-ExternalEditor.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/Zope-FSDump.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/Zope-FileSystemSite.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/Zope-Formulator.spec?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/SPECS/Zope-GroupUserFolder.spec?r1=1.29&r2=1.30&f=u

More information about the pld-cvs-commit mailing list