From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 12 Mar 2007 00:16:41 +0000 (+0000)
Subject: - rel 2 (use %service)
X-Git-Tag: auto/th/dict-ksocrat-1_0_1-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdict-ksocrat.git;a=commitdiff_plain;h=b106a4a7d2f61c074ddc856b8e68a62d83b0f1f1

- rel 2 (use %service)

Changed files:
    dict-ksocrat.spec -> 1.5
---

diff --git a/dict-ksocrat.spec b/dict-ksocrat.spec
index 7727371..fd7a4aa 100644
--- a/dict-ksocrat.spec
+++ b/dict-ksocrat.spec
@@ -3,7 +3,7 @@ Summary:	English<->Russian dictionary for dictd
 Summary(pl.UTF-8):	Słownik angielsko<->rosyjski dla dictd
 Name:		dict-%{dictname}
 Version:	1.0.1
-Release:	1
+Release:	2
 License:	for use with KSocrat only
 Group:		Applications/Dictionaries
 Source0:	http://webua.net/zavolzhsky/download/%{dictname}-enru-dic-%{version}.tar.bz2
@@ -14,6 +14,7 @@ URL:		http://webua.net/zavolzhsky/english/programs.html
 Patch0:		%{dictname}-enru.patch
 BuildRequires:	dictfmt
 BuildRequires:	dictzip
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{_sysconfdir}/dictd
 Requires:	dictd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -88,23 +89,19 @@ mv %{dictname}* $RPM_BUILD_ROOT%{_datadir}/dictd
 rm -rf $RPM_BUILD_ROOT
 
 %post enru
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun enru
-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 ruen
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun ruen
-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 enru