- use %service

Changed files:
    Zope-CMFForum.spec -> 1.22

diff --git a/Zope-CMFForum.spec b/Zope-CMFForum.spec
index ddd7637200cfc51e6eb9833133abd155cc389096..fe1363e21b7dcb17b5971dc174dbb14a1d014b22 100644 (file)
--- a/Zope-CMFForum.spec
+++ b/Zope-CMFForum.spec
@@ -10,13 +10,14 @@ Source0:    http://dl.sourceforge.net/collective/%{zope_subname}-%{version}.tgz
 # 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
@@ -50,16 +51,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