- use %service

[packages/Zope-COREBlog.git] / Zope-COREBlog.spec

diff --git a/Zope-COREBlog.spec b/Zope-COREBlog.spec
index 0286d8548b2e0c4183a5ea9c61dd549ee29176ac..ea0d0c4b49f4af6bb3fe291a5fdbfa544a06e805 100644 (file)
--- a/Zope-COREBlog.spec
+++ b/Zope-COREBlog.spec
@@ -1,18 +1,19 @@
-%include       /usr/lib/rpm/macros.python
 %define                zope_subname    COREBlog
 Summary:       Blog / Weblog / Web Nikki system on Zope
 Summary(pl):   System bloga/webloga oparty na Zope
 Name:          Zope-%{zope_subname}
-Version:       0.72b
+Version:       1.22
 Release:       1
 License:       GPL
 Group:         Development/Tools
-Source0:       http://zope.org/Members/ats/%{zope_subname}/%{zope_subname}%{version}/%{zope_subname}072b.tgz
-# Source0-md5: b228a19162f57340abedceeada7bf075
+Source0:       http://coreblog.org/junk/%{zope_subname}122.tgz
+# Source0-md5: d2d1ca0c38da09d6edf907b36bdc123e
 URL:           http://coreblog.org/
+BuildRequires: python
+BuildRequires: rpmbuild(macros) >= 1.268
 %pyrequires_eq python-modules
+Requires(post,postun): /usr/sbin/installzopeproduct
 Requires:      Zope >= 2.6.1
-Requires(post,postun):  /usr/sbin/installzopeproduct
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -25,6 +26,7 @@ System bloga/webloga oparty na Zope.
 %prep
 %setup -q -n %{zope_subname}
 find . -type d -name CVS | xargs rm -rf
+find . -type f -name .DS_Store | xargs rm -rf
 
 %build
 mkdir docs docs/stripogram
@@ -49,16 +51,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
+       /usr/sbin/installzopeproduct -d %{zope_subname}
+       %service -q zope restart
 fi
 
 %files