- use %service

Changed files:
    Zope-CMFPortalContentFolder.spec -> 1.7

diff --git a/Zope-CMFPortalContentFolder.spec b/Zope-CMFPortalContentFolder.spec
index bba6ecca615feb932f59e2751a9940cc71e49958..053e71648e3568ef5360381ae0964c4b1d7c03a8 100644 (file)
--- a/Zope-CMFPortalContentFolder.spec
+++ b/Zope-CMFPortalContentFolder.spec
@@ -9,14 +9,15 @@ Group:                Development/Tools
 Source0:       http://zope.org/Members/efge/%{zope_subname}/%{version}/%{zope_subname}-%{version}.tgz
 # Source0-md5: 5d0e180802af83c9c5334db93cd76325
 URL:           http://zope.org/Members/efge/PortalContentFolder/
-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
+Conflicts:     CMF
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Conflicts:     CMF
 
 %description
 PortalContentFolder (for CMF) is a mix of both PortalContent and
@@ -45,16 +46,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %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