rpms/dhcdbd/devel dhcdbd.spec,1.46,1.47

[David Cantrell (dcantrel)]

Author: dcantrel

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

Modified Files:
	dhcdbd.spec 
Log Message:
* Mon Jun 11 2007 David Cantrell <dcantrell at redhat.com> - 2.8-2
- Merge review (#225690)



Index: dhcdbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- dhcdbd.spec	5 Jun 2007 20:12:53 -0000	1.46
+++ dhcdbd.spec	11 Jun 2007 17:10:27 -0000	1.47
@@ -5,7 +5,7 @@
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS
 Name:      dhcdbd
 Version:   2.8
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPL
 Group:     System Environment/Daemons
 URL:       http://people.redhat.com/dcantrel/%{name}/
@@ -16,10 +16,10 @@
 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
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
 
 %description
 dhcdbd provides a D-BUS interface to the ISC dhclient software.  The
@@ -34,6 +34,7 @@
 %{__make} %{?_smp_mflags}
 
 %install
+%{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 %{__mkdir} -p %{buildroot}%{_initrddir}
 %{__install} -p -c -m 0755 dhcdbd.init %{buildroot}%{_initrddir}/dhcdbd
@@ -52,7 +53,7 @@
 fi
 
 %postun
-if [ "$1" -ge "1" ]; then
+if [ $1 = 1 ]; then
     /sbin/service dhcdbd condrestart >/dev/null 2>&1 || :
 fi
 
@@ -65,6 +66,9 @@
 %attr(755,root,root) %{_initrddir}/dhcdbd
 
 %changelog
+* Mon Jun 11 2007 David Cantrell <dcantrell at redhat.com> - 2.8-2
+- Merge review (#225690)
+
 * Tue Jun 05 2007 David Cantrell <dcantrell at redhat.com> - 2.8-1
 - Use dbus to avoid waking up so often (#218406)
 
@@ -159,8 +163,8 @@
   o use dhclient -q option
 
 * Thu Oct 06 2005 Jason Vas Dias <jvdias at redhat.com> 1.9-1
-- fix bug 169937: do 'chkconfig --add dhcdbd' in %post 
-- Add CHANGES changelog file to %doc generated from this changelog
+- fix bug 169937: do 'chkconfig --add dhcdbd' in %%post 
+- Add CHANGES changelog file to %%doc generated from this changelog
 - Rebuild with new dbus / gcc / glibc
 
 * Fri Aug 12 2005 Jason Vas Dias <jvdias at redhat.com> 1.8-1