- use %service

Changed files:
    Zope-CMFMPoll.spec -> 1.8

diff --git a/Zope-CMFMPoll.spec b/Zope-CMFMPoll.spec
index 1508f525b44ae1f96d95b9d5eb05b7b7831667de..829f82c1c6da494bbdb82673a6dc243e18ca2dd5 100644 (file)
--- a/Zope-CMFMPoll.spec
+++ b/Zope-CMFMPoll.spec
@@ -9,15 +9,16 @@ Group:                Development/Tools
 Source0:       http://dl.sourceforge.net/collective/%{zope_subname}-%{version}.tar.gz
 # Source0-md5: bc8dd0f835e51a16a421e550bb4667f3
 URL:           http://sourceforge.net/projects/collective/
 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: python

+BuildRequires: rpmbuild(macros) >= 1.268
+Requires(post,postun): /usr/sbin/installzopeproduct

 %pyrequires_eq python-modules
 Requires:      Zope
 Requires:      Zope-CMF
 Requires:      Zope-archetypes
 %pyrequires_eq python-modules
 Requires:      Zope
 Requires:      Zope-CMF
 Requires:      Zope-archetypes

+Conflicts:     CMF

 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)

-Conflicts:     CMF

 
 %description
 Sime cookie-based poll product based on Archetypes.
 
 %description
 Sime cookie-based poll product based on Archetypes.


@@ -44,16 +45,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
 
 %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}
 
 %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
 fi
 
 %files