- use %service

Changed files:
    Zope-CMFPhoto.spec -> 1.20

diff --git a/Zope-CMFPhoto.spec b/Zope-CMFPhoto.spec
index c03e7a5becb1f08784e01934fe1e0310041772f3..17b01dab84c267fae1d8c2467b5b8546bdcc4ae0 100644 (file)
--- a/Zope-CMFPhoto.spec
+++ b/Zope-CMFPhoto.spec
@@ -11,16 +11,17 @@ Source0:    http://dl.sourceforge.net/collective/%{zope_subname}-%{version}%{sub_ve
 # 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
@@ -49,16 +50,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