From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sun, 19 Mar 2006 18:38:11 +0000 (+0000)
Subject: - use %service
X-Git-Url: http://git.pld-linux.org/?p=packages%2FZope-CMFMPoll.git;a=commitdiff_plain;h=e81effdbddd31640f7187933bd115de2a227b5a7

- use %service

Changed files:
    Zope-CMFMPoll.spec -> 1.8
---

diff --git a/Zope-CMFMPoll.spec b/Zope-CMFMPoll.spec
index 1508f52..829f82c 100644
--- 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/
-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-archetypes
+Conflicts:	CMF
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Conflicts:	CMF
 
 %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}
-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