- use %service

Changed files:
    Zope-CMFCollector.spec -> 1.29

diff --git a/Zope-CMFCollector.spec b/Zope-CMFCollector.spec
index 0148de7843afb8b32e0918b701f3b3c347b417ba..c11915f4fb1ee5c9f9c6fc7cec090a72fed65fe0 100644 (file)
--- a/Zope-CMFCollector.spec
+++ b/Zope-CMFCollector.spec
@@ -10,13 +10,14 @@ Source0:    http://zope.org/Members/bowerymarc/%{zope_subname}-update/%{version}/%{
 # 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.
@@ -44,16 +45,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