rpms/rbldnsd/devel rbldnsd.spec,1.5,1.6 sources,1.4,1.5

[Paul Howarth (pghmcfc)]

Author: pghmcfc

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

Modified Files:
	rbldnsd.spec sources 
Log Message:
- upstream released a new version without changing the version number (the
  only changes are in debian/control and debian/changelog, neither of which
  are used in the RPM package)
- unexpand tabs in spec
- use the standard scriptlet for user/group creation in %%pre
- drop scriptlet dependencies on /sbin/service by calling initscript directly
- clarify license as GPL version 2 or later



Index: rbldnsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rbldnsd/devel/rbldnsd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rbldnsd.spec	30 Aug 2006 07:42:07 -0000	1.5
+++ rbldnsd.spec	23 Aug 2007 16:05:51 -0000	1.6
@@ -1,21 +1,18 @@
-Summary:        Small, fast daemon to serve DNSBLs
-Name:           rbldnsd
-Version:        0.996a
-Release:        2%{?dist}
-License:        GPL
-Group:          System Environment/Daemons
-URL:            http://www.corpit.ru/mjt/rbldnsd.html
-Source0:        http://www.corpit.ru/mjt/rbldnsd/rbldnsd_%{version}.tar.gz
-Source1:        rbldnsd.init
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  zlib-devel
-
-Requires(pre):    /usr/sbin/useradd
-Requires(post):   /sbin/chkconfig
-Requires(post):   /sbin/service
-Requires(preun):  /sbin/chkconfig
-Requires(preun):  /sbin/service
-Requires(postun): /sbin/service
+Summary:	Small, fast daemon to serve DNSBLs
+Name:		rbldnsd
+Version:	0.996a
+Release:	3%{?dist}
+License:	GPLv2+
+Group:		System Environment/Daemons
+URL:		http://www.corpit.ru/mjt/rbldnsd.html
+Source0:	http://www.corpit.ru/mjt/rbldnsd/rbldnsd_%{version}.tar.gz
+Source1:	rbldnsd.init
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	zlib-devel
+
+Requires(pre):	shadow-utils
+Requires(post):	/sbin/chkconfig
+Requires(preun): /sbin/chkconfig
 
 %description
 Rbldnsd is a small, authoritative-only DNS nameserver designed to serve
@@ -24,10 +21,11 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%{__sed} -i -e 's@/var/lib/rbldns\([/ ]\)@%{_localstatedir}/lib/rbldnsd\1 at g' \
-            -e 's@\(-r/[a-z/]*\) -b@\1 -q -b at g' debian/rbldnsd.default
+%{__sed} -i	-e 's@/var/lib/rbldns\([/ ]\)@%{_localstatedir}/lib/rbldnsd\1 at g' \
+		-e 's@\(-r/[a-z/]*\) -b@\1 -q -b at g' debian/rbldnsd.default
 
 %build
+# this is not an autotools-generated configure script, and does not support --libdir
 CFLAGS="%{optflags}" ./configure
 %{__make}
 
@@ -35,40 +33,52 @@
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}{%{_sbindir},%{_mandir}/man8,%{_initrddir},%{_sysconfdir}/sysconfig}
 %{__mkdir_p} %{buildroot}%{_localstatedir}/lib/rbldnsd
-%{__install} -m 755 rbldnsd                %{buildroot}%{_sbindir}
-%{__install} -m 644 rbldnsd.8              %{buildroot}%{_mandir}/man8
-%{__install} -m 644 debian/rbldnsd.default %{buildroot}%{_sysconfdir}/sysconfig/rbldnsd
-%{__install} -m 755 %{SOURCE1}             %{buildroot}%{_initrddir}/rbldnsd
+%{__install} -m 755 rbldnsd			%{buildroot}%{_sbindir}
+%{__install} -m 644 rbldnsd.8			%{buildroot}%{_mandir}/man8
+%{__install} -m 644 debian/rbldnsd.default	%{buildroot}%{_sysconfdir}/sysconfig/rbldnsd
+%{__install} -m 755 %{SOURCE1}			%{buildroot}%{_initrddir}/rbldnsd
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %pre
-/usr/sbin/useradd -r -s /sbin/nologin -d %{_localstatedir}/lib/rbldnsd \
-        -c "rbldns daemon" rbldns &>/dev/null || :
+/usr/bin/getent group rbldns >/dev/null || /usr/sbin/groupadd -r rbldns
+/usr/bin/getent passwd rbldns >/dev/null || \
+	/usr/sbin/useradd -r -g rbldns -d %{_localstatedir}/lib/rbldnsd \
+		-s /sbin/nologin -c "rbldns daemon" rbldns
+exit 0
 
 %post
 /sbin/chkconfig --add rbldnsd || :
 
 %preun
 if [ $1 -eq 0 ]; then
-    /sbin/service rbldnsd stop &>/dev/null || :
-    /sbin/chkconfig --del rbldnsd || :
+	%{_initrddir}/rbldnsd stop &>/dev/null || :
+	/sbin/chkconfig --del rbldnsd || :
 fi
 
 %postun
-/sbin/service rbldnsd condrestart &>/dev/null || :
+%{_initrddir}/rbldnsd condrestart &>/dev/null || :
 
 %files
-%defattr (-,root,root,0755)
+%defattr (-,root,root,-)
 %doc README.user NEWS TODO debian/changelog CHANGES-0.81
 %{_sbindir}/rbldnsd
 %{_mandir}/man8/rbldnsd.8*
-%dir %{_localstatedir}/lib/rbldnsd
+%dir %{_localstatedir}/lib/rbldnsd/
 %config(noreplace) %{_sysconfdir}/sysconfig/rbldnsd
 %{_initrddir}/rbldnsd
 
 %changelog
+* Thu Aug 23 2007 Paul Howarth <paul at city-fan.org> 0.996a-3
+- upstream released a new version without changing the version number (the
+  only changes are in debian/control and debian/changelog, neither of which
+  are used in the RPM package)
+- unexpand tabs in spec
+- use the standard scriptlet for user/group creation in %%pre
+- drop scriptlet dependencies on /sbin/service by calling initscript directly
+- clarify license as GPL version 2 or later
+
 * Wed Aug 30 2006 Paul Howarth <paul at city-fan.org> 0.996a-2
 - FE6 mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rbldnsd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jul 2006 11:16:39 -0000	1.4
+++ sources	23 Aug 2007 16:05:51 -0000	1.5
@@ -1 +1 @@
-bd2e54e1962408293fcbfaf7ccd66e81  rbldnsd_0.996a.tar.gz
+306a437fdd36d48f921a4698ba23b2a9  rbldnsd_0.996a.tar.gz