- rel 4 (use %service)

Changed files:
    dict-idp.spec -> 1.21

diff --git a/dict-idp.spec b/dict-idp.spec
index aba81db0e11b0370a929f8ddd12003abb723bb76..cb790d224bbc33d427806bea58edb6e8ac6f5499 100644 (file)
--- a/dict-idp.spec
+++ b/dict-idp.spec
@@ -12,7 +12,7 @@ Summary(pl.UTF-8):    Darmowe słowniki dla dictd z projektu IDP
 Name:          dict-%{dictname}
 Version:       19990219
 # Last update on their site
-Release:       3
+Release:       4
 License:       GPL
 # is this '#This file is free to use and modify. Thank you for using the IDP.'
 # compatible w/ Gnu GPL ???
@@ -38,6 +38,7 @@ Source99:     http://www.june29.com/IDP/IDPdisclaimer.html
 URL:           http://www.june29.com/IDP/
 BuildRequires: dictfmt
 BuildRequires: dictzip
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      %{_sysconfdir}/dictd
 Requires:      dictd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -191,63 +192,51 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 %post %{dict1}
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun %{dict1}
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2 || true
+if [ "$1" = 0 ]; then
+       %service -q dictd restart
 fi
 
 %post %{dict2}
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun %{dict2}
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2 || true
+if [ "$1" = 0 ]; then
+       %service -q dictd restart
 fi
 
 %post %{dict3}
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun %{dict3}
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2 || true
+if [ "$1" = 0 ]; then
+       %service -q dictd restart
 fi
 
 %post %{dict4}
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun %{dict4}
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2 || true
+if [ "$1" = 0 ]; then
+       %service -q dictd restart
 fi
 
 %post %{dict5}
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun %{dict5}
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2 || true
+if [ "$1" = 0 ]; then
+       %service -q dictd restart
 fi
 
 %post %{dict6}
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun %{dict6}
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2 || true
+if [ "$1" = 0 ]; then
+       %service -q dictd restart
 fi
 
 %files %{dict1}