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

[glen]

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

---- Files affected:
SPECS:
   dict-wn.spec (1.21 -> 1.21.2.1) 

---- Diffs:

================================================================
Index: SPECS/dict-wn.spec
diff -u SPECS/dict-wn.spec:1.21 SPECS/dict-wn.spec:1.21.2.1
--- SPECS/dict-wn.spec:1.21	Wed Aug 18 20:04:30 2004
+++ SPECS/dict-wn.spec	Mon Mar 12 02:04:44 2007
@@ -4,15 +4,16 @@
 Summary(pl):	System referencji słownikowych WordNet dla dictd
 Name:		dict-%{dictname}
 Version:	2.0
-Release:	2
+Release:	3
 License:	Free to use, but see http://www.cogsci.princeton.edu/~wn/
 Group:		Applications/Dictionaries
 # note: pre means preformatted
 Source0:	ftp://ftp.dict.org/pub/dict/pre/%{name}-%{version}-pre.tar.gz
 # Source0-md5:	fcfedcc13815cde1e28103b61c05c168
 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
@@ -42,18 +43,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"`)
@@ -62,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21.2.1  2007/03/12 01:04:44  glen
+- HEAD merge
+
 Revision 1.21  2004/08/18 18:04:30  domelu
 - rel. 2 to rebuild
 
@@ -82,22 +84,22 @@
 
 Revision 1.15  2002/12/28 11:46:09  gotar
 - forced my version of 1.7a:
- - more unified with other dicts,
- - removed BR: autoconf, dictzip,
- - standard %buildsubdir,
- - other cosmetics.
+- more unified with other dicts,
+- removed BR: autoconf, dictzip,
+- standard %buildsubdir,
+- other cosmetics.
 
 Revision 1.13  2002/09/09 14:31:48  gotar
 - cosmetics,
 - unified config entries and dict-* specs appearance.
 
 Revision 1.12  2002/05/21 23:12:56  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.11  2002/04/25 16:11:52  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.10  2002/04/25 11:53:24  kloczek
 - release 3.
@@ -110,7 +112,7 @@
   Group field using gettext).
 
 Revision 1.7  2002/01/18 02:12:42  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.6  2001/11/21 14:52:37  qboosh
 - pl translations
@@ -119,7 +121,7 @@
 - ac stuff (STBR all dict*)
 
 Revision 1.4  2001/07/26 02:57:29  agaran
-changed group (Dictionary => Dictionaries)
+- changed group (Dictionary => Dictionaries)
 
 Revision 1.3  2000/08/14 09:19:14  mis
 - /etc/dictd is used instead of modify /etc/dictd.conf in %post
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dict-wn.spec?r1=1.21&r2=1.21.2.1&f=u