From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 12 Mar 2007 00:51:48 +0000 (+0000)
Subject: - HEAD merge
X-Git-Tag: AC-STABLE
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=refs%2Ftags%2FAC-STABLE;p=packages%2Fdict-web1913.git

- HEAD merge

Changed files:
    dict-web1913.spec -> 1.20.2.1
---

diff --git a/dict-web1913.spec b/dict-web1913.spec
index d51a46e..ff04f46 100644
--- a/dict-web1913.spec
+++ b/dict-web1913.spec
@@ -4,7 +4,7 @@ Summary:	Webster's Revised Unabridged Dictionary for dictd
 Summary(pl):	S³ownik Webster's Revised Unabridged Dictionary dla dictd
 Name:		dict-%{dictname}
 Version:	1.4
-Release:	8
+Release:	9
 License:	Free for personal or research use, distributable
 Group:		Applications/Dictionaries
 Source0:	ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz
@@ -19,8 +19,9 @@ BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	dictzip
 BuildRequires:	flex
-Requires:	dictd
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{_sysconfdir}/dictd
+Requires:	dictd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -65,16 +66,14 @@ mv %{dictname}.{dict.dz,index} $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
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/%{dictname}.dictconf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dictd/%{dictname}.dictconf
 %{_datadir}/dictd/%{dictname}.*