rpms/dhcdbd/devel .cvsignore, 1.18, 1.19 dhcdbd.spec, 1.33, 1.34 sources, 1.28, 1.29 dhcdbd-1.15-dbus-deprecated.patch, 1.1, NONE dhcdbd.init, 1.6, NONE

[fedora-cvs-commits at redhat.com]

Author: dcantrel

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

Modified Files:
	.cvsignore dhcdbd.spec sources 
Removed Files:
	dhcdbd-1.15-dbus-deprecated.patch dhcdbd.init 
Log Message:
- Rolled in dbus-deprecated patch changes to upstream source
- Corrected init script problems (#202219)
- Install the init script from the source archive, not SOURCES



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	30 May 2006 21:24:14 -0000	1.18
+++ .cvsignore	14 Aug 2006 18:04:53 -0000	1.19
@@ -1,17 +1 @@
-dhcdbd-1.tar.gz
-dhcdbd-1.0.tar.gz
-dhcdbd-1.1.tar.gz
-dhcdbd-1.2.tar.gz
-dhcdbd-1.3.tar.gz
-dhcdbd-1.4.tar.gz
-dhcdbd-1.5.tar.gz
-dhcdbd-1.6.tar.gz
-dhcdbd-1.7.tar.gz
-dhcdbd-1.8.tar.gz
-dhcdbd-1.9.tar.gz
-dhcdbd.spec
-dhcdbd-1.10.tar.gz
-dhcdbd-1.11.tar.gz
-dhcdbd-1.12.tar.gz
-dhcdbd-1.14.tar.gz
-dhcdbd-1.15.tar.gz
+dhcdbd-1.16.tar.gz


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- dhcdbd.spec	19 Jul 2006 13:55:49 -0000	1.33
+++ dhcdbd.spec	14 Aug 2006 18:04:53 -0000	1.34
@@ -8,15 +8,13 @@
 #  initscript and be run as root during boot .
 #
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options.
-Name: 	   dhcdbd
-Version:   1.15
-Release:   1.FC6.3
+Name:      dhcdbd
+Version:   1.16
+Release:   1%{?dist}
 License:   GPL
 Group:     System Environment/Daemons
-URL: 	   http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz
+URL:       http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.gz
 Source0:   %{name}-%{version}.tar.gz
-Source1:   dhcdbd.init
-Patch0: dhcdbd-1.15-dbus-deprecated.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:  dhclient >= 3.0.2-12, dbus >= 0.6
 BuildRequires: dbus-devel >= 0.90
@@ -25,9 +23,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dbus-deprecated
 
-cp -fp %SOURCE1 RedHat/
 # Copy latest .spec file to RedHat source dir so that up-to-date %doc/CHANGES can be generated
 if [ -e %{_specdir}/%{name}.spec ]; then
 # looks like beehive build. dhcdbd.spec is in %{_specdir}, not %{_srcdir} 
@@ -57,7 +53,7 @@
 DESTDIR=$RPM_BUILD_ROOT make install
 %if ! %{DHCDBD_SETUID}
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -c -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcdbd
+install -c -m 755 RedHat/dhcdbd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcdbd
 %endif
 %if %{NODEBUGINFO}
 /usr/lib/rpm/brp-compress
@@ -95,6 +91,11 @@
 %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h
 
 %changelog
+* Mon Aug 14 2006 David Cantrell <dcantrell at redhat.com> - 1.16-1
+- Rolled in dbus-deprecated patch changes to upstream source
+- Corrected init script problems (#202219)
+- Install the init script from the source archive, not SOURCES
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 1.15-1.FC6.3
 - Rebuild against new dbus
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	30 May 2006 21:24:14 -0000	1.28
+++ sources	14 Aug 2006 18:04:53 -0000	1.29
@@ -1 +1 @@
-113497d34630ea9fc15a10cb730d4fe1  dhcdbd-1.15.tar.gz
+002e9d7d85a2f0e6261b6bf501c53a3e  dhcdbd-1.16.tar.gz


--- dhcdbd-1.15-dbus-deprecated.patch DELETED ---


--- dhcdbd.init DELETED ---