- cleaning

[packages/pdnsd.git] / pdnsd.spec

diff --git a/pdnsd.spec b/pdnsd.spec
index 058c991b3809b08eaf7d32d22814104b3f18108b..3094e57058f5fd9a90af7e0bf1fea30073170ce3 100644 (file)
--- a/pdnsd.spec
+++ b/pdnsd.spec
@@ -1,24 +1,24 @@
 Summary:       A caching dns proxy for small networks or dialin accounts
 Summary(pl):   DNS proxy serwer dla ma³ej sieci lub jednostki z po³±czeniem dialup
 Name:          pdnsd
-Version:       1.1.6
-Release:       3
+Version:       1.1.7a
+Release:       5
 License:       GPL
 Group:         Networking/Daemons
-Group(de):     Netzwerkwesen/Server
-Group(pl):     Sieciowe/Serwery
-Vendor:                Thomas Moestl
 Source0:       http://home.t-online.de/home/Moestl/%{name}-%{version}.tar.bz2
 Source1:       %{name}.init
-Patch0:                %{name}-automake.patch
-Patch1:                %{name}-confdir.patch
+Patch0:                %{name}-threads_signals.patch
 URL:           http://home.t-online.de/home/Moestl/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: flex
-Prereq:                /sbin/chkconfig
-Prereq:                rc-scripts
+PreReq:                /sbin/chkconfig
+PreReq:                rc-scripts
+Provides:      caching-nameserver
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes:     bind
+Obsoletes:     maradns
+Obsoletes:     maradns-zoneserver
 
 %description
 pdnsd is a proxy DNS daemon with permanent (disk-)cache and the
@@ -34,14 +34,14 @@ dialup).
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p0
 
 %build
-aclocal
-autoconf
-autoheader
-automake -a -f
+rm -f missing
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        --enable-ipv6
 %{__make}
@@ -50,14 +50,10 @@ automake -a -f
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pdnsd
-mv -f $RPM_BUILD_ROOT%{_sysconfdir}/pdnsd.conf.sample \
-       $RPM_BUILD_ROOT%{_sysconfdir}/pdnsd.conf
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-gzip -9nf AUTHORS ChangeLog NEWS README TODO \
-       doc/txt/*.txt
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pdnsd
+mv -f $RPM_BUILD_ROOT%{_sysconfdir}/pdnsd.conf{.sample,}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,10 +76,11 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc {*,doc/txt/*}.gz doc/html/*.html
+%doc AUTHORS ChangeLog NEWS README TODO doc/txt/*.txt doc/html/*.html
 %attr(754,root,root) /etc/rc.d/init.d/pdnsd
 %attr(755,root,root) %{_sbindir}/pdnsd
 %attr(755,root,root) %{_sbindir}/pdnsd-ctl
 %attr(775,nobody,nobody) %dir %{_var}/cache/pdnsd
 %attr(664,nobody,nobody) %config(noreplace) %verify(not md5 size mtime) %{_var}/cache/pdnsd/pdnsd.cache
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pdnsd.conf
+%{_mandir}/man8/*