rpms/nsd/FC-4 nsd.spec,1.3,1.4

[Paul Wouters (pwouters)]

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3706

Modified Files:
	nsd.spec 
Log Message:
* Thu Dec 15 2005 Paul Wouters <paul at xelerance.com> - 2.3.3-6
- Moved pid file to /var/run/nsd/nsd.pid.
- Use %{_localstatedir} instead of "/var"



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsd.spec	13 Dec 2005 14:05:48 -0000	1.3
+++ nsd.spec	15 Dec 2005 04:52:14 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -9,7 +9,6 @@
 Patch0: nsd-2.3.3-checking.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: openssl
 BuildRequires: flex, openssl-devel
 
 %description
@@ -23,7 +22,7 @@
 %patch0 -p1 -b .checking.patch
 
 %configure --enable-bind8-stats --enable-plugins \
-           --enable-mmap --with-pidfile=/var/run/nsd.pid --with-ssl \
+           --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd
 
 %build
@@ -38,6 +37,7 @@
 install -d 0755 %{buildroot}/%{_sbindir}
 install -d 0755 %{buildroot}/%{_mandir}/man8
 install -d 0755 %{buildroot}/%{_initrddir}
+install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name}
 
 install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf
 install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones
@@ -57,12 +57,13 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
+%attr(0700,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /var/run/%{name}.pid ]; then
+if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
 	/sbin/service %{name} stop
 fi
 # "Everyone is doing it, so why can't we?" 
@@ -72,7 +73,7 @@
 # do not activate daemon upon request. Fedora Extra policy
 
 %preun
-if [ -f /var/run/%{name}.pid ]
+if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
 then
         /sbin/service %{name} stop > /dev/null 2>&1
 fi
@@ -89,7 +90,14 @@
 fi
 
 %changelog
-* Mon Dec 12 2005 Paul Wouters <paul at xelerance.com> - 2.3.3
+* Thu Dec 15 2005 Paul Wouters <paul at xelerance.com> - 2.3.3-6
+- Moved pid file to /var/run/nsd/nsd.pid.
+- Use %{_localstatedir} instead of "/var"
+
+* Tue Dec 13 2005 Paul Wouters <paul at xelerance.com> - 2.3.3-5
+- Added BuildRequires for openssl-devel, removed Requires for openssl.
+
+* Mon Dec 12 2005 Paul Wouters <paul at xelerance.com> - 2.3.3-4
 - upgraded to nsd-2.3.3
 
 * Wed Dec  7 2005 Tom "spot" Callaway <tcallawa at redhat.com> - 2.3.2-2