- rel 5 (use %service)

Changed files:
    dict-mueller7acc.spec -> 1.11

diff --git a/dict-mueller7acc.spec b/dict-mueller7acc.spec
index 9fea09b1d8d5efada1865b5b4cd1673d3fbecd8d..79bac78aeb2a917a1ec2db6bc9d05a173333269c 100644 (file)
--- a/dict-mueller7acc.spec
+++ b/dict-mueller7acc.spec
@@ -3,7 +3,7 @@ Summary:        English-Russian dictionary with accents for dictd
 Summary(pl.UTF-8):     Słownik angielsko-rosyjski z akcentami dla dictd
 Name:          dict-%{dictname}
 Version:       1.2
-Release:       4
+Release:       5
 License:       GPL
 Group:         Applications/Dictionaries
 Source0:       http://mueller-dic.chat.ru/Mueller7accentGPL.tgz
@@ -15,6 +15,7 @@ Source1:      http://www.math.sunysb.edu/~comech/tools/to-dict
 URL:           http://mueller-dic.chat.ru/
 BuildRequires: dictfmt
 BuildRequires: dictzip
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      %{_sysconfdir}/dictd
 Requires:      dictd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -29,10 +30,10 @@ akcentami V. K. Muellera.
 
 %prep
 %setup -q -c
-
-%build
 cp %{SOURCE1} .
 chmod +x ./to-dict
+
+%build
 ./to-dict --no-trans usr/local/share/dict/Mueller7accentGPL.koi mueller7acc.notr
 ./to-dict --src-data mueller7acc.notr mueller7acc.data && rm -f mueller7acc.notr
 ./to-dict --data-dict mueller7acc.data mueller7acc && rm -f mueller7acc.data
@@ -55,13 +56,11 @@ mv %{dictname}.* $RPM_BUILD_ROOT%{_datadir}/dictd
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun
-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