- opt,system-zlib patches: use optflags and system zlib

- BuildRequires: bison, zlib-devel
- fixed %%post (s/subsystem/subsys/)
- release 4

Changed files:
    dictd-opt.patch -> 1.1
    dictd-system-zlib.patch -> 1.1
    dictd.spec -> 1.17

diff --git a/dictd-opt.patch b/dictd-opt.patch
new file mode 100644 (file)
index 0000000..09f029e
--- /dev/null
+++ b/dictd-opt.patch
@@ -0,0 +1,87 @@
+diff -Nur dictd-1.5.5.orig/configure.in dictd-1.5.5/configure.in
+--- dictd-1.5.5.orig/configure.in      Sat Nov 17 20:19:56 2001
++++ dictd-1.5.5/configure.in   Sat Nov 17 20:20:57 2001
+@@ -42,21 +42,12 @@
+ echo Configuring for dict
+ 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_CC
+ AC_ISC_POSIX
+ 
+ REALCC="$CC"
+ if test "$CC" = gcc; then
+-    CFLAGS='-g -O'
+     WCFLAGS='-Wall'
+     case "$host" in
+       dnl did include: -Winline
+@@ -68,18 +59,12 @@
+     esac
+                               # Silence flex/bison output
+     SCFLAGS="-Wno-implicit -Wno-unused"
+-else
+-    CFLAGS='-g'
+ fi
+ 
+ local_dmalloc=0
+ local_libmaa=0
+ local_zlib=0
+ 
+-AC_ARG_WITH(cflags,
+-[  --with-cflags=FLAGS     use FLAGS for CFLAGS],
+-CFLAGS="$withval")
+-
+ AC_ARG_WITH(prof,
+ [  --with-prof             with prof profiling],
+ [
+diff -Nur dictd-1.5.5.orig/libmaa/configure.in dictd-1.5.5/libmaa/configure.in
+--- dictd-1.5.5.orig/libmaa/configure.in       Mon Jul  6 00:14:34 1998
++++ dictd-1.5.5/libmaa/configure.in    Sat Nov 17 20:21:30 2001
+@@ -43,24 +43,13 @@
+ 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_CC
+ AC_ISC_POSIX
+ 
+ REALCC="$CC"
+ if test "$CC" = gcc; then
+-    CFLAGS='-g -O'
+     WCFLAGS='-Wall -pedantic'
+-else
+-    CFLAGS='-g'
+ fi
+ 
+ needs_xmalloc=1
+@@ -75,14 +64,6 @@
+     WCFLAGS="$WCFLAGS -pipe";;
+ esac
+ 
+-AC_ARG_WITH(cflags,
+-[  --with-cflags=FLAGS     use FLAGS for CFLAGS],
+-[
+-if test "x${withval}" = xyes; then
+-    CFLAGS="$withval"
+-fi
+-])
+-
+ AC_ARG_WITH(prof,
+ [  --with-prof             with prof profiling],
+ [

diff --git a/dictd-system-zlib.patch b/dictd-system-zlib.patch
new file mode 100644 (file)
index 0000000..4f759db
--- /dev/null
+++ b/dictd-system-zlib.patch
@@ -0,0 +1,10 @@
+--- dictd-1.5.5/configure.in.orig      Sat Nov 17 20:06:54 2001
++++ dictd-1.5.5/configure.in   Sat Nov 17 20:13:23 2001
+@@ -205,7 +205,6 @@
+ fi
+ 
+ dnl Always use local libz to avoid problems with header files
+-local_zlib=1
+ if test "$local_zlib" = 0; then
+     AC_CHECK_LIB(z,zlibVersion,REALLIBS="$REALLIBS -lz",local_zlib=1)
+ fi

diff --git a/dictd.spec b/dictd.spec
index a3614e97b66c6dd4b30912796293b1fc3520c05f..f636e69c5da32cfd3a31cd46408e6c4362ecf3d0 100644 (file)
--- a/dictd.spec
+++ b/dictd.spec
@@ -2,7 +2,7 @@ Summary:        Dictionary database server
 Summary(pl):   Serwer bazy s³owników
 Name:          dictd
 Version:       1.5.5
-Release:       3
+Release:       4
 License:       GPL
 Group:         Daemons
 Group(de):     Server
@@ -11,10 +11,14 @@ Source0:    ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Patch0:                %{name}-no_libnsl.patch
+Patch1:                %{name}-system-zlib.patch
+Patch2:                %{name}-opt.patch
 URL:           http://www.dict.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: flex
+BuildRequires: bison
+BuildRequires: zlib-devel
 Prereq:                /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -72,16 +76,15 @@ dane do pseudo-swobodnego dost
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-# --without-local-zlib option gives no effect. Usage of zlib from dictd tarball 
-# is hardcoded in configure. 
-# 
 aclocal
 autoconf
 (cd libmaa; aclocal; autoconf)
-%configure \
-       --with-local-zlib=no
+%configure
+
 %{__make}
 
 %install
@@ -89,18 +92,18 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,%{name}},%{_bindir},%{_sbindir}} \
           $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_mandir}/man{1,8}}
 
-install dict dictzip $RPM_BUILD_ROOT/%{_bindir}
-install {dict,dictzip}.1 $RPM_BUILD_ROOT/%{_mandir}/man1
+install dict dictzip $RPM_BUILD_ROOT%{_bindir}
+install {dict,dictzip}.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-install %{name} $RPM_BUILD_ROOT/%{_sbindir}
-install %{name}.8 $RPM_BUILD_ROOT/%{_mandir}/man8
+install %{name} $RPM_BUILD_ROOT%{_sbindir}
+install %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
 echo "server localhost" > dict.conf
 echo -e "access {\n\tallow localhost\n\tdeny *\n}\n" > %{name}-main.conf 
 
 install dict.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install dictd-main.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-touch %{buildroot}%{_sysconfdir}/%{name}.conf
+touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
@@ -112,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsystem/%{name} ]; then
+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."