rpms/nsd/devel nsd.spec,1.36,1.37

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1016

Modified Files:
	nsd.spec 
Log Message:
fix license tag


Index: nsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- nsd.spec	30 Jun 2008 04:34:02 -0000	1.36
+++ nsd.spec	11 Aug 2008 20:20:22 -0000	1.37
@@ -1,8 +1,8 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 3.1.0
-Release: 1%{?dist}
-License: BSD-like
+Release: 2%{?dist}
+License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
 Source1: nsd.init
@@ -10,6 +10,7 @@
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel
+Requires(pre): shadow-utils
 
 %description
 NSD is a complete implementation of an authoritative DNS name server.
@@ -20,13 +21,13 @@
 %prep
 %setup -q 
 
+%build
 %configure --enable-bind8-stats --enable-plugins --enable-checking \
            --enable-mmap --with-ssl --enable-nsec3 --enable-nsid \
            --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd --with-difffile=%{_localstatedir}/lib/%{name}/ixfr.db \
            --with-xfrdfile=%{_localstatedir}/lib/%{name}/ixfr.state
 
-%build
 %{__make} %{?_smp_mflags}
 #convert to utf8
 iconv -f iso8859-1 -t utf-8 doc/RELNOTES > doc/RELNOTES.utf8
@@ -69,8 +70,10 @@
 %{_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
-# "Everyone is doing it, so why can't we?" 
+getent group nsd >/dev/null || groupadd -r nsd
+getent passwd nsd >/dev/null || \
+useradd -r -g nsd -d /etc/nsd -s /sbin/nologin \
+-c "nsd daemon account" nsd
 exit 0
 
 %post
@@ -88,6 +91,10 @@
 fi
 
 %changelog
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.1.0-2
+- fix license tag
+- fix static user creation
+
 * Mon Jun 30 2008 Paul Wouters <paul at xelerance.com> - 3.1.0-1
 - Updated to 3.1.0