rpms/dhcdbd/devel .cvsignore, 1.25, 1.26 dhcdbd.spec, 1.41, 1.42 sources, 1.35, 1.36

[fedora-cvs-commits at redhat.com]

Author: dcantrel

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17824

Modified Files:
	.cvsignore dhcdbd.spec sources 
Log Message:
* Mon Apr 09 2007 David Cantrell <dcantrell at redhat.com> - 2.7-1
- Spec file scriptlet cleanups



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	5 Mar 2007 18:53:54 -0000	1.25
+++ .cvsignore	9 Apr 2007 18:45:41 -0000	1.26
@@ -1 +1 @@
-dhcdbd-2.6.tar.bz2
+dhcdbd-2.7.tar.bz2


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- dhcdbd.spec	5 Mar 2007 18:53:54 -0000	1.41
+++ dhcdbd.spec	9 Apr 2007 18:45:41 -0000	1.42
@@ -6,16 +6,23 @@
 
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS
 Name:      dhcdbd
-Version:   2.6
+Version:   2.7
 Release:   1%{?dist}
 License:   GPL
 Group:     System Environment/Daemons
-URL:       http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2
-Source0:   %{name}-%{version}.tar.bz2
+URL:       http://people.redhat.com/dcantrel/%{name}/
+
+Source:    http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:  dhclient >= 3.0.4, dbus >= 0.6
 BuildRequires: dbus-devel >= 0.90, pkgconfig
 
+Requires: dhclient >= 3.0.4, dbus >= 0.6
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+
 %description
 dhcdbd provides a D-BUS interface to the ISC dhclient software.  The
 daemon provides access to DHCP configuration operations and stores those
@@ -37,21 +44,19 @@
 %{__rm} -rf %{buildroot}
 
 %post
+# This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add dhcdbd
-exit 0
 
 %preun
-if [ $1 -eq 0 ]; then
-    service dhcdbd stop >/dev/null 2>&1
+if [ $1 = 0 ]; then
+    /sbin/service dhcdbd stop >/dev/null 2>&1 || :
     /sbin/chkconfig --del dhcdbd
 fi
-exit 0
 
 %postun
-if [ $1 -ge 1 ]; then
-    service dhcdbd condrestart >/dev/null 2>&1
+if [ "$1" -ge "1" ]; then
+    /sbin/service dhcdbd condrestart >/dev/null 2>&1 || :
 fi
-exit 0
 
 %files
 %defattr(-, root, root, -)
@@ -62,6 +67,9 @@
 %attr(755,root,root) %{_initrddir}/dhcdbd
 
 %changelog
+* Mon Apr 09 2007 David Cantrell <dcantrell at redhat.com> - 2.7-1
+- Spec file scriptlet cleanups
+
 * Mon Mar 05 2007 David Cantrell <dcantrell at redhat.com> - 2.6-1
 - Spec file cleanups to conform to Fedora packaging guidelines
 - Run 'chkconfig --del dhcdbd' on package removal (#222514)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	5 Mar 2007 18:53:54 -0000	1.35
+++ sources	9 Apr 2007 18:45:41 -0000	1.36
@@ -1 +1 @@
-e8242676e71787ec6b7e800d28cb9a3f  dhcdbd-2.6.tar.bz2
+9edf3eabe05487e7ee5f0b685683d7fb  dhcdbd-2.7.tar.bz2