- bin- and dirnames to rpm macros,

- changed behaviour of package with pdnsd.cache file,
- cosmetics, fixed typos in spec.

Changed files:
    pdnsd.spec -> 1.7

diff --git a/pdnsd.spec b/pdnsd.spec
index f2c93472518b826791f7b6de55db23cc537416f5..9c2f6b3d66eff0340a64529e5325543cdf7f1e84 100644 (file)
--- a/pdnsd.spec
+++ b/pdnsd.spec
@@ -1,17 +1,17 @@
 Summary:       A caching dns proxy for small networks or dialin accounts
-Summary:       DNS proxy serwer dla ma³ej sieci lub jednostli z po³±czeniem dialup
+Summary(pl):   DNS proxy serwer dla ma³ej sieci lub jednostki z po³±czeniem dialup
 Name:          pdnsd
 Version:       1.1.2a
-Release:       1
+Release:       2
 License:       GPL
-Vendor:                Thomas Moestl
 Group:         Daemons
 Group(de):     Server
 Group(pl):     Serwery
+Vendor:                Thomas Moestl
 Source0:       http://home.t-online.de/home/Moestl/%{name}-%{version}.tar.bz2
 Source1:       %{name}.init
-BuildRequires: flex
 URL:           http://home.t-online.de/home/Moestl/
+BuildRequires: flex
 Prereq:                rc-scripts
 Prereq:                /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -23,8 +23,8 @@ outages or hangups and to prevent DNS-dependent applications like
 Netscape Navigator from hanging.
 
 %description -l pl
-pdnsd jest serwerem proxy do us³ugi DNS zapisujacym bufor ze zgromadzony,mi
-informacjami na dysku. Bêdzie on szczególnie u¿yteczny dla jednostki z
+pdnsd jest serwerem proxy do us³ugi DNS zapisujacym bufor ze zgromadzonymi
+informacjami na dysku. Bêdzie on szczególnie u¿yteczny dla jednostki
 pracujacej w trybie off-line (np. poprzez po³±czenie dialup).
 
 %prep
@@ -36,45 +36,42 @@ pracujacej w trybie off-line (np. poprzez po
 %{__make}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+%{__rm} -rf $RPM_BUILD_ROOT
+%{__install} -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
-
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pdnsd
-
-mv $RPM_BUILD_ROOT%{_sysconfdir}/pdnsd.conf.sample \
+%{__install} %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/pdnsd
+%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/pdnsd.conf.sample \
        $RPM_BUILD_ROOT%{_sysconfdir}/pdnsd.conf
 
-gzip -9nf AUTHORS ChangeLog NEWS README TODO \
+%{__gzip} -9nf AUTHORS ChangeLog NEWS README TODO \
        doc/txt/*.txt
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
                                                                                 
 %post
 /sbin/chkconfig --add pdnsd
-if [ -f /var/lock/subsys/pdnsd ]; then
-       /etc/rc.d/init.d/pdnsd restart >&2
+if [ -f %{_localstatedir}/lock/subsys/pdnsd ]; then
+       %{_sysconfdir}/rc.d/init.d/pdnsd restart >&2
 else
-       echo "Run \"/etc/rc.d/init.d/pdnsd start\" to start pdnsd." >&2
+       echo "Run \"%{_sysconfdir}/rc.d/init.d/pdnsd start\" to start pdnsd." >&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/pdnsd ]; then
-               /etc/rc.d/init.d/pdnsd stop
+       if [ -f %{_localstatedir}/lock/subsys/pdnsd ]; then
+               %{_sysconfdir}/rc.d/init.d/pdnsd stop
        fi
        /sbin/chkconfig --del pdnsd
-       rm -f /var/cache/pdnsd/pdnsd.cache
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz doc/txt/*.gz doc/html/index.html doc/html/dl.html doc/html/doc.html doc/html/faq.html
-%attr(754,root,root) /etc/rc.d/init.d/pdnsd
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pdnsd.conf
+%doc {*,doc/txt/*}.gz doc/html/{index,dl,doc,faq}.html
+%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/pdnsd
 %attr(755,root,root) %{_sbindir}/pdnsd
-%attr(770,nobody,nobody) %dir /var/cache/pdnsd
-%attr(660, nobody, nobody) %config /var/cache/pdnsd/pdnsd.cache
+%attr(770,nobody,nobody) %dir %{_localstatedir}/cache/pdnsd
+%attr(660,nobody,nobody) %config(noreplace) %verify(not md5 size link mtime) %{_localstatedir}/cache/pdnsd/pdnsd.cache
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pdnsd.conf