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

[glen]

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

---- Files affected:
SPECS:
   dict-gcide.spec (1.7 -> 1.7.2.1) 

---- Diffs:

================================================================
Index: SPECS/dict-gcide.spec
diff -u SPECS/dict-gcide.spec:1.7 SPECS/dict-gcide.spec:1.7.2.1
--- SPECS/dict-gcide.spec:1.7	Thu Aug 19 17:51:15 2004
+++ SPECS/dict-gcide.spec	Mon Mar 12 02:00:37 2007
@@ -4,7 +4,7 @@
 Summary(pl):	Słownik Collaborative International Dictionary of English dla dictd
 Name:		dict-%{dictname}
 Version:	0.44
-Release:	3
+Release:	4
 License:	GPL
 Group:		Applications/Dictionaries
 Source0:	ftp://ftp.dict.org/pub/dict/pre/%{name}-%{version}.tar.gz
@@ -12,8 +12,9 @@
 # based on ftp://ftp.gnu.org/gnu/gcide/gcide-0.46/README.DIC
 Source1:	%{name}-README.DIC
 URL:		http://www.dict.org/
-Requires:	dictd
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{_sysconfdir}/dictd
+Requires:	dictd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,25 +41,23 @@
 	data  \"$dictprefix.dict.dz\"
 	index \"$dictprefix.index\"
 }" > $RPM_BUILD_ROOT%{_sysconfdir}/dictd/%{dictname}.dictconf
-mv %{dictname}.* $RPM_BUILD_ROOT%{_datadir}/dictd
+cp -a %{dictname}.* $RPM_BUILD_ROOT%{_datadir}/dictd
 
 %clean
 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)
 %doc README.DIC
-%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"`)
@@ -67,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7.2.1  2007/03/12 01:00:37  glen
+- HEAD merge
+
 Revision 1.7  2004/08/19 15:51:15  averne
 - rel++
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dict-gcide.spec?r1=1.7&r2=1.7.2.1&f=u