- use %service

Changed files:
    Zope-CMFContentPanels.spec -> 1.16

diff --git a/Zope-CMFContentPanels.spec b/Zope-CMFContentPanels.spec
index 40d73d5a398779f0728279cf8d690e0b8c0a596e..e1aa0bfda85f059d8ca54938e0ac17158b547372 100644 (file)
--- a/Zope-CMFContentPanels.spec
+++ b/Zope-CMFContentPanels.spec
@@ -10,16 +10,17 @@ Group:              Development/Tools
 Source0:       http://plone.org/products/cmfcontentpanels/releases/%{version}/contentpanels-2_0.tgz
 # Source0-md5: 95e2e17255faca6f1122fc64723074b2
 URL:           http://www.zopechina.com/products-en/CMFContentPanels/
-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
 Requires:      Zope-CMFPlone
-BuildArch:     noarch
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Conflicts:     CMF
 Conflicts:     Plone
+BuildArch:     noarch
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 A CMF/Plone portlets product.
@@ -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