SPECS (AC-branch): dict-web1913.spec - HEAD merge

[glen]

Author: glen                         Date: Mon Mar 12 00:51:53 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge

---- Files affected:
SPECS:
   dict-web1913.spec (1.20 -> 1.20.2.1) 

---- Diffs:

================================================================
Index: SPECS/dict-web1913.spec
diff -u SPECS/dict-web1913.spec:1.20 SPECS/dict-web1913.spec:1.20.2.1
--- SPECS/dict-web1913.spec:1.20	Thu Aug 19 17:51:15 2004
+++ SPECS/dict-web1913.spec	Mon Mar 12 01:51:48 2007
@@ -5,7 +5,7 @@
 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
@@ -20,8 +20,9 @@
 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
@@ -66,18 +67,16 @@
 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}.*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -86,6 +85,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20.2.1  2007/03/12 00:51:48  glen
+- HEAD merge
+
 Revision 1.20  2004/08/19 15:51:15  averne
 - rel++
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dict-web1913.spec?r1=1.20&r2=1.20.2.1&f=u