SPECS (AC-branch): dictd.spec - update to 1.10.4 from HEAD

glen glen at pld-linux.org
Mon Mar 12 02:09:07 CET 2007


Author: glen                         Date: Mon Mar 12 01:09:07 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- update to 1.10.4 from HEAD

---- Files affected:
SPECS:
   dictd.spec (1.56.2.1 -> 1.56.2.2) 

---- Diffs:

================================================================
Index: SPECS/dictd.spec
diff -u SPECS/dictd.spec:1.56.2.1 SPECS/dictd.spec:1.56.2.2
--- SPECS/dictd.spec:1.56.2.1	Wed May 10 23:25:31 2006
+++ SPECS/dictd.spec	Mon Mar 12 02:09:02 2007
@@ -2,12 +2,12 @@
 Summary:	Dictionary database server
 Summary(pl):	Serwer bazy słowników
 Name:		dictd
-Version:	1.10.2
-Release:	3
+Version:	1.10.4
+Release:	2
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/dict/%{name}-%{version}.tar.gz
-# Source0-md5:	5bafbdb3adfcfcc3d82fb219a8f50595
+# Source0-md5:	1c0b7583e6fa25fd27fca5fca9ddb91f
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-opt.patch
@@ -20,12 +20,13 @@
 BuildRequires:	judy-devel
 BuildRequires:	libdbi-devel
 BuildRequires:	perl-base
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
-Requires:	/sbin/chkconfig
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		specflags_ia32	 -fomit-frame-pointer 
+%define		specflags_ia32	 -fomit-frame-pointer
 
 %description
 Server for the Dictionary Server Protocol (DICT), a TCP transaction
@@ -174,27 +175,21 @@
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon."
-fi
+%service dictd restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/%{name} ]; then
-		/etc/rc.d/init.d/%{name} stop >&2
-	fi
+	%service dictd stop
 	/sbin/chkconfig --del %{name}
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc ANNOUNCE NEWS README* TODO dictd.conf example* security.txt
+%doc ANNOUNCE NEWS README* TODO examples/dictd* security.txt
 %ghost %{_sysconfdir}/%{name}.conf
 %dir %{_sysconfdir}/%{name}
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/%{name}/%{name}-main.conf
-%config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}-main.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(755,root,root) %{_sbindir}/%{name}
 %dir %{_datadir}/%{name}
@@ -215,7 +210,7 @@
 
 %files -n dict
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/dict.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dict.conf
 %attr(755,root,root) %{_bindir}/colorit
 %attr(755,root,root) %{_bindir}/dict
 %attr(755,root,root) %{_bindir}/dictl
@@ -241,6 +236,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56.2.2  2007/03/12 01:09:02  glen
+- update to 1.10.4 from HEAD
+
 Revision 1.56.2.1  2006/05/10 21:25:31  radek
 - SECURITY release 3: added -umask.patch
 
@@ -331,7 +329,7 @@
 - adapterized
 
 Revision 1.29  2002/12/07 14:32:49  ankry
-- fix improper usage of %%{_sysconfdir}
+- fix improper usage of %{_sysconfdir}
 
 Revision 1.28  2002/09/27 17:20:40  gotar
 - changed dictd group from Daemons to Networking/Daemons,
@@ -354,15 +352,15 @@
 - stbr
 
 Revision 1.24  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.23  2002/05/05 17:50:18  kloczek
 - release 6.
 
 Revision 1.22  2002/04/25 16:11:43  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.21  2002/02/23 01:47:49  kloczek
 - adapterized.
@@ -372,7 +370,7 @@
   Group field using gettext).
 
 Revision 1.19  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.18  2001/11/25 23:02:21  undefine
 - UID/GID=nobody
@@ -382,7 +380,7 @@
 Revision 1.17  2001/11/17 20:35:18  qboosh
 - opt,system-zlib patches: use optflags and system zlib
 - BuildRequires: bison, zlib-devel
-- fixed %%post (s/subsystem/subsys/)
+- fixed %post (s/subsystem/subsys/)
 - release 4
 
 Revision 1.16  2001/11/07 16:05:43  kloczek
@@ -415,7 +413,7 @@
 - reverting last change: removing new macros from %p{re,ost}{,un}
 
 Revision 1.7  2001/04/30 16:05:16  kloczek
-- added using %%{rpmcflags} macro.
+- added using %{rpmcflags} macro.
 
 Revision 1.6  2001/03/17 14:31:06  undefine
 - update to 1.5.5
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dictd.spec?r1=1.56.2.1&r2=1.56.2.2&f=u



More information about the pld-cvs-commit mailing list