- use %service

Changed files:
    Zope-Hotfix.spec -> 1.3

diff --git a/Zope-Hotfix.spec b/Zope-Hotfix.spec
index 6ef6212cb0fb04852eccd8fb7a3af7586781c047..5644c534e75e4c233825b04a70fdc6dca2266d5a 100644 (file)
--- a/Zope-Hotfix.spec
+++ b/Zope-Hotfix.spec
@@ -11,8 +11,9 @@ Source0:      http://zope.org/Products/Zope/Hotfix-2005-04-05/%{zope_subname}-2005040
 URL:           http://www.zope.org/Products/Zope/Hotfix-2005-04-05/announce-Hotfix_20050405/
 BuildRequires: python
 %pyrequires_eq python-modules
 URL:           http://www.zope.org/Products/Zope/Hotfix-2005-04-05/announce-Hotfix_20050405/
 BuildRequires: python
 %pyrequires_eq python-modules

-Requires:      Zope
+BuildRequires: rpmbuild(macros) >= 1.268

 Requires(post,postun): /usr/sbin/installzopeproduct
 Requires(post,postun): /usr/sbin/installzopeproduct

+Requires:      Zope

 Obsoletes:     Zope-Hotfix = 040713
 Obsoletes:     Zope-Hotfix = 040714
 BuildArch:     noarch
 Obsoletes:     Zope-Hotfix = 040713
 Obsoletes:     Zope-Hotfix = 040714
 BuildArch:     noarch


@@ -45,16 +46,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