rpms/nsd/devel nsd.spec,1.5,1.6
Paul Wouters (pwouters)
fedora-extras-commits at redhat.com
Thu Dec 15 15:49:01 UTC 2005
Author: pwouters
Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30021
Modified Files:
nsd.spec
Log Message:
* Thu Dec 15 2005 Paul Wouters <paul at xelerance.com> - 2.3.3-7
- chkconfig and attribute changes as proposed by Dmitry Butskoy
Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsd.spec 15 Dec 2005 04:50:32 -0000 1.5
+++ nsd.spec 15 Dec 2005 15:48:59 -0000 1.6
@@ -1,7 +1,7 @@
Summary: NSD is a complete implementation of an authoritative DNS name server
Name: nsd
Version: 2.3.3
-Release: 6%{?dist}
+Release: 7%{?dist}
License: BSD-like
Url: http://open.nlnetlabs.nl/nsd/
Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -29,10 +29,10 @@
%{__make} %{?_smp_mflags}
%install
+rm -rf %{buildroot}
# Not using their 'make install' since it uses install-sh which does not
# get the correct install path within the RPM_BUILD_ROOT
#%{__make} install
-rm -rf %{buildroot}
install -d 0755 %{buildroot}/%{_sysconfdir}/nsd
install -d 0755 %{buildroot}/%{_sbindir}
install -d 0755 %{buildroot}/%{_mandir}/man8
@@ -51,7 +51,7 @@
rm -rf ${RPM_BUILD_ROOT}
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc README LICENSE NSD-DATABASE DIFFERENCES dbaccess.c TODO RELNOTES REQUIREMENTS
%dir %{_sysconfdir}/nsd/
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
@@ -70,19 +70,13 @@
exit 0
%post
-# do not activate daemon upon request. Fedora Extra policy
+/sbin/chkconfig --add %{name}
%preun
-if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
-then
+if [ $1 -eq 0 ]; then
/sbin/service %{name} stop > /dev/null 2>&1
+ /sbin/chkconfig --del %{name}
fi
-if [ $1 -eq 0 ]
-then
- /sbin/chkconfig --del %{name} > /dev/null 2>&1
-fi
-# "Everyone is doing it, so why can't we?"
-exit 0
%postun
if [ "$1" -ge "1" ]; then
@@ -90,6 +84,9 @@
fi
%changelog
+* Thu Dec 15 2005 Paul Wouters <paul at xelerance.com> - 2.3.3-7
+- chkconfig and attribute changes as proposed by Dmitry Butskoy
+
* 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"
More information about the fedora-extras-commits
mailing list