- use %service

Changed files:
    Zope-ExternalEditor.spec -> 1.22

diff --git a/Zope-ExternalEditor.spec b/Zope-ExternalEditor.spec
index 1e5cc20ebda99b65b305f95a55de84778a78fca9..a9f1ea93d7f6466146e6cf82879e969eb63d9fb5 100644 (file)
--- a/Zope-ExternalEditor.spec
+++ b/Zope-ExternalEditor.spec
@@ -10,23 +10,23 @@ Source0:    http://plope.com/software/ExternalEditor/ExternalEditor-%{version}-src.
 # Source0-md5: 6befe8f5af29e8b4e27d9aba0299b57c
 URL:           http://plope.com/software/ExternalEditor/
 BuildRequires: python
 # Source0-md5: 6befe8f5af29e8b4e27d9aba0299b57c
 URL:           http://plope.com/software/ExternalEditor/
 BuildRequires: python

+BuildRequires: rpmbuild(macros) >= 1.268

 %pyrequires_eq python-modules
 %pyrequires_eq python-modules

-Requires:      Zope

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

+Requires:      Zope

 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description

-ExternalEditor is a Zope product, a new way to integrate Zope more seamlessly
-with client-side tools. 
-This package is supposed to be installed on Zope server, there is a zopeedit
-tool for clients.
+ExternalEditor is a Zope product, a new way to integrate Zope more
+seamlessly with client-side tools. This package is supposed to be
+installed on Zope server, there is a zopeedit tool for clients.

 
 %description -l pl
 ExternalEditor jest dodatkiem do Zope, umo¿liwiaj±cym w nowy, bardziej
 przezroczysty sposób integrowaæ Zope z narzêdziami od strony klienta.
 
 %description -l pl
 ExternalEditor jest dodatkiem do Zope, umo¿liwiaj±cym w nowy, bardziej
 przezroczysty sposób integrowaæ Zope z narzêdziami od strony klienta.

-Ten pakiet powinien byæ zainstalowany na serwerze Zope. Od strony klienta
-dostêp do niego zapewnia pakiet zopeedit.
+Ten pakiet powinien byæ zainstalowany na serwerze Zope. Od strony
+klienta dostêp do niego zapewnia pakiet zopeedit.

 
 %prep
 %setup -q -n %{zope_subname}
 
 %prep
 %setup -q -n %{zope_subname}


@@ -49,16 +49,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
 
 %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
 fi
 
 %files