packages: dictd/dictd-umask.patch, dictd/dictd.spec, dictd/dictd-opt.patch ...

qboosh qboosh at pld-linux.org
Sun Nov 14 08:59:16 CET 2010 

Author: qboosh                       Date: Sun Nov 14 07:59:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.11.2
- updated umask patch, removed obsolete opt patch
- relies on system libmaa now

---- Files affected:
packages/dictd:
   dictd-umask.patch (1.2 -> 1.3) , dictd.spec (1.62 -> 1.63) , dictd-opt.patch (1.4 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/dictd/dictd-umask.patch
diff -u packages/dictd/dictd-umask.patch:1.2 packages/dictd/dictd-umask.patch:1.3
--- packages/dictd/dictd-umask.patch:1.2	Mon Mar 12 02:18:51 2007
+++ packages/dictd/dictd-umask.patch	Sun Nov 14 08:59:11 2010
@@ -1,9 +1,9 @@
---- dictd-1.10.4/net.c~	2007-03-12 03:16:48.309292226 +0200
-+++ dictd-1.10.4/net.c	2007-03-12 03:18:03.790998983 +0200
-@@ -188,6 +188,7 @@
- #endif
+--- dictd-1.11.2/daemon3.c.orig	2007-12-29 14:16:10.000000000 +0100
++++ dictd-1.11.2/daemon3.c	2010-11-14 08:02:06.363095747 +0100
+@@ -41,6 +41,7 @@
  
-    chdir("/");		/* cd to safe directory */
+    if (!nochdir)
+       chdir("/");		/* cd to safe directory */
 +   umask(077);		/* set safe umask */
  
     setpgid(0,getpid());	/* Get process group */

================================================================
Index: packages/dictd/dictd.spec
diff -u packages/dictd/dictd.spec:1.62 packages/dictd/dictd.spec:1.63
--- packages/dictd/dictd.spec:1.62	Mon Mar 12 02:07:15 2007
+++ packages/dictd/dictd.spec	Sun Nov 14 08:59:11 2010
@@ -2,23 +2,23 @@
 Summary:	Dictionary database server
 Summary(pl.UTF-8):	Serwer bazy słowników
 Name:		dictd
-Version:	1.10.4
-Release:	2
-License:	GPL
+Version:	1.11.2
+Release:	1
+License:	GPL v1+
 Group:		Networking/Daemons
-Source0:	http://dl.sourceforge.net/dict/%{name}-%{version}.tar.gz
-# Source0-md5:	1c0b7583e6fa25fd27fca5fca9ddb91f
+Source0:	http://downloads.sourceforge.net/dict/%{name}-%{version}.tar.gz
+# Source0-md5:	7008ec3bb0001c302ce751580f9d2ea4
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
-Patch0:		%{name}-opt.patch
-Patch1:		%{name}-umask.patch
+Patch0:		%{name}-umask.patch
 URL:		http://www.dict.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	judy-devel
 BuildRequires:	libdbi-devel
+BuildRequires:	libmaa-devel
 BuildRequires:	perl-base
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
@@ -26,6 +26,9 @@
 Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# plugins dir
+%define		_libexecdir	%{_libdir}/dictd
+
 %define		specflags_ia32	 -fomit-frame-pointer
 
 %description
@@ -52,25 +55,25 @@
 Pakiet programistyczny do tworzenia wtyczek dictd.
 
 %package plugin-dbi
-Summary:	DBI plygin for dictd server
+Summary:	DBI plugin for dictd server
 Summary(pl.UTF-8):	Wtyczka DBI dla serwera dictd
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description plugin-dbi
-DBI plygin for dictd server.
+DBI plugin for dictd server.
 
 %description plugin-dbi -l pl.UTF-8
 Wtyczka DBI dla serwera dictd.
 
 %package plugin-judy
-Summary:	Judy plygin for dictd server
+Summary:	Judy plugin for dictd server
 Summary(pl.UTF-8):	Wtyczka Judy dla serwera dictd
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description plugin-judy
-Judy plygin for dictd server.
+Judy plugin for dictd server.
 
 %description plugin-judy -l pl.UTF-8
 Wtyczka Judy dla serwera dictd.
@@ -132,28 +135,22 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-# broken test if >1 plugins
-%{__perl} -pi -e 's/test \$\(PLUGINS\)/test "\$\(PLUGINS\)"/' Makefile.in
 
 %build
 cp -f /usr/share/automake/config.* .
 %{__aclocal}
 %{__autoconf}
-cd libmaa
-cp -f /usr/share/automake/config.* .
-%{__aclocal}
-%{__autoconf}
-cd ..
 CFLAGS="%{rpmcflags} -DUID_NOBODY=99 -DGID_NOBODY=99"
-%configure
+%configure \
+	--with-plugin-dbi \
+	--with-plugin-judy \
+	--with-system-utf8-funcs
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,%{name}},%{_datadir}/%{name}}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{_sysconfdir}/%{name},%{_datadir}/%{name}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -167,6 +164,8 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
+%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/dictdplugin_*.{la,a}
+
 mv -f doc/security.doc security.txt
 
 %clean
@@ -184,7 +183,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc ANNOUNCE NEWS README* TODO examples/dictd* security.txt
+%doc ANNOUNCE ChangeLog NEWS README TODO examples/dictd* security.txt
 %ghost %{_sysconfdir}/%{name}.conf
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}-main.conf
@@ -192,7 +191,8 @@
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(755,root,root) %{_sbindir}/%{name}
 %dir %{_datadir}/%{name}
-%{_mandir}/man8/%{name}*
+%dir %{_libexecdir}
+%{_mandir}/man8/dictd.8*
 
 %files devel
 %defattr(644,root,root,755)
@@ -201,11 +201,11 @@
 
 %files plugin-dbi
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/dictdplugin_dbi.so
+%attr(755,root,root) %{_libexecdir}/dictdplugin_dbi.so*
 
 %files plugin-judy
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/dictdplugin_judy.so
+%attr(755,root,root) %{_libexecdir}/dictdplugin_judy.so*
 
 %files -n dict
 %defattr(644,root,root,755)
@@ -235,6 +235,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2010/11/14 07:59:11  qboosh
+- updated to 1.11.2
+- updated umask patch, removed obsolete opt patch
+- relies on system libmaa now
+
 Revision 1.62  2007/03/12 01:07:15  glen
 - umask patch from AC-branch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dictd/dictd-umask.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dictd/dictd.spec?r1=1.62&r2=1.63&f=u

More information about the pld-cvs-commit mailing list