- updated to 1.11.2

- updated umask patch, removed obsolete opt patch
- relies on system libmaa now

Changed files:
    dictd-opt.patch -> 1.5
    dictd-umask.patch -> 1.3
    dictd.spec -> 1.63

diff --git a/dictd-opt.patch b/dictd-opt.patch
deleted file mode 100644 (file)
index 34a9c4d..0000000
--- a/dictd-opt.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -ur dictd-1.9.10.orig/configure.in dictd-1.9.10/configure.in
---- dictd-1.9.10.orig/configure.in     Thu Jul 24 15:46:44 2003
-+++ dictd-1.9.10/configure.in  Thu Jul 24 15:48:00 2003
-@@ -48,14 +48,6 @@
- 
- DICT_VERSION=VERSION
- 
--AC_ARG_WITH(cc,
--[  --with-cc               with cc (instead of gcc)],
--[
--if test "x${withval}" = xyes; then
--    CC=cc
--fi
--])
--
- AC_CANONICAL_HOST
- AC_PROG_CC
- dnl AC_PROG_CXX
-@@ -64,7 +56,6 @@
- 
- REALCC="$CC"
- if test "$CC" = gcc; then
--    CFLAGS='-g -O'
-     WCFLAGS='-Wall'
-     case "$host" in
-       dnl did include: -Winline
-@@ -76,8 +67,6 @@
-     esac
-                               # Silence flex/bison output
-     SCFLAGS="-Wno-implicit -Wno-unused"
--else
--    CFLAGS='-g'
- fi
- 
- local_dmalloc=0
-@@ -85,10 +74,6 @@
- local_zlib=0
- local_regex=0
- 
--AC_ARG_WITH(cflags,
--[  --with-cflags=FLAGS     use FLAGS for CFLAGS],
--CFLAGS="$withval")
--
- AC_ARG_WITH(prof,
- [  --with-prof             with prof profiling],
- [
-diff -ur dictd-1.9.10.orig/libmaa/configure.in dictd-1.9.10/libmaa/configure.in
---- dictd-1.9.10.orig/libmaa/configure.in      Thu Jul 24 15:46:44 2003
-+++ dictd-1.9.10/libmaa/configure.in   Thu Jul 24 15:49:01 2003
-@@ -44,14 +44,6 @@
- echo Configuring for libmaa $MAA_MAJOR.$MAA_MINOR
- echo .
- 
--AC_ARG_WITH(cc,
--[  --with-cc               with cc (instead of gcc)],
--[
--if test "x${withval}" = xyes; then
--    CC=cc
--fi
--])
--
- AC_CANONICAL_HOST
- AC_PROG_AWK
- AC_PROG_CC
-@@ -59,10 +51,7 @@
- 
- REALCC="$CC"
- if test "$CC" = gcc; then
--    CFLAGS='-g -O'
-     WCFLAGS='-Wall -pedantic'
--else
--    CFLAGS='-g'
- fi
- 
- needs_xmalloc=1
-@@ -77,14 +66,7 @@
-     WCFLAGS="$WCFLAGS -pipe";;
- esac
- 
--AC_ARG_WITH(cflags,
--[  --with-cflags=FLAGS     use FLAGS for CFLAGS],
--[
--if test "x${withval}" = xyes; then
--    CFLAGS="$withval"
--fi
--])
--
-+CFLAGS="$CFLAGS -fPIC"
- AC_ARG_WITH(prof,
- [  --with-prof             with prof profiling],
- [

diff --git a/dictd-umask.patch b/dictd-umask.patch
index c35cc5b34c59f79cadfb3ef624abba197afb7b2d..59911bc13fa823fc09aebb90c8bf966643999bb7 100644 (file)
--- a/dictd-umask.patch
+++ b/dictd-umask.patch
@@ -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 */

diff --git a/dictd.spec b/dictd.spec
index 5fad2bbd8e5e8b3910631283a92a293d9bbeabd5..bcec635be23d3b9d554b44769e87218d08a34156 100644 (file)
--- a/dictd.spec
+++ b/dictd.spec
@@ -1,23 +1,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
@@ -25,6 +25,9 @@ Requires(post,preun): /sbin/chkconfig
 Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# plugins dir
+%define                _libexecdir     %{_libdir}/dictd
+
 %define                specflags_ia32   -fomit-frame-pointer
 
 %description
@@ -51,25 +54,25 @@ Package for dictd plugins development.
 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.
@@ -131,28 +134,22 @@ dane do pseudo-swobodnego dostępu do pliku.
 %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
@@ -166,6 +163,8 @@ install dictd-main.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 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
@@ -183,7 +182,7 @@ fi
 
 %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
@@ -191,7 +190,8 @@ fi
 %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)
@@ -200,11 +200,11 @@ fi
 
 %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)