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

[packages/dictd.git] / dictd.spec

diff --git a/dictd.spec b/dictd.spec
index 61c49e3b65949b5abc7bf5b032e45d31df982332..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:       1
+Release:       4
 License:       GPL
 Group:         Daemons
 Group(de):     Server
@@ -10,9 +10,16 @@ Group(pl):   Serwery
 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/
-Requires:      /bin/cat
-Requires:      /bin/ls
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: flex
+BuildRequires: bison
+BuildRequires: zlib-devel
+Prereq:                /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description 
@@ -45,6 +52,7 @@ definicji s
 
 %package -n dictzip
 Summary:       Compress (or expand) files, allowing random access
+Summary(pl):   Kompresja (i dekompresja) plików pozwalaj±ca na swobodny dostêp
 Group:         Applications/Archiving
 Group(de):     Applikationen/Archivierung
 Group(pl):     Aplikacje/Archiwizacja
@@ -58,48 +66,46 @@ compressed file. Dictd, the DICT protocol dictionary server will make
 use of this data to perform pseudo-random access on the file.
 
 %description -n dictzip -l pl
-dictzip kompresuje pliki ko¿ystaj±c z zawartego w gzip(1) algorytmu
+dictzip kompresuje pliki korzystaj±c z zawartego w gzip(1) algorytmu
 (LZ77) który jest ca³kowicie kompatybilny z formatem plików gzip.
-Rozszerzenie do formatu plików gzip(pole dodatkowe, opisane w 2.3.1.1
+Rozszerzenie do formatu plików gzip (pole dodatkowe, opisane w 2.3.1.1
 RFC 1952) pozwalaj±cego na dodatkowe dane zapisane w nag³ówku
 skompresowanego pliku. Dictd, serwer protoko³u DICT wykorzystuje te
-dane do pseudo-losowego dostêpu do pliku.
+dane do pseudo-swobodnego dostêpu do pliku.
 
 %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. 
-# 
-# TODO: 
-# - patch needed instead of use -DUID_NOBODY=`id -u nobody`
-#
-CFLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS} -DUID_NOBODY=`id -u nobody`"
-export CFLAGS
-%configure \
-       --with-local-zlib=no
+aclocal
+autoconf
+(cd libmaa; aclocal; autoconf)
+%configure
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{rc.d/init.d,sysconfig,%{name}},%{_bindir},%{_sbindir}} \
+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
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
+install dict.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install dictd-main.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+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}
 
 mv -f doc/security.doc security.txt
 gzip -9nf {ANNOUNCE,ChangeLog,README,TODO,%{name}.conf,example*.conf,example.site,security.txt}
@@ -109,20 +115,23 @@ 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."
 fi
     
 %preun
-if [ $1 = 0 ]; then
-        /sbin/chkconfig --del %{name}
-        /etc/rc.d/init.d/%{name} stop >&2 || true
+if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/%{name} ]; then
+               /etc/rc.d/init.d/%{name} stop >&2
+       fi
+       /sbin/chkconfig --del %{name}
 fi
 
 %files
 %defattr(644,root,root,755)
+%doc *.gz
 %ghost %{_sysconfdir}/%{name}.conf
 %attr(755,root,root) %{_sbindir}/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
@@ -131,7 +140,6 @@ fi
 %dir %{_sysconfdir}/%{name}
 %{_sysconfdir}/%{name}/%{name}-main.conf
 %{_mandir}/man8/%{name}*
-%doc {ANNOUNCE,ChangeLog,README,TODO,%{name}.conf,example*.conf,example.site,security.txt}.gz
 
 %files -n dict
 %defattr(644,root,root,755)