rpms/libdhcp/devel libdhcp-1.27-includes.patch, NONE, 1.1 libdhcp.spec, 1.60, 1.61

[David Cantrell (dcantrel)]

Author: dcantrel

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

Modified Files:
	libdhcp.spec 
Added Files:
	libdhcp-1.27-includes.patch 
Log Message:
* Tue Oct 23 2007 David Cantrell <dcantrell at redhat.com> - 1.27-4
- Patch include paths for isc_dhcp headers
- Require newer dhcp packages


libdhcp-1.27-includes.patch:

--- NEW FILE libdhcp-1.27-includes.patch ---
diff -up libdhcp-1.27/dhcp4_nic.c.includes libdhcp-1.27/dhcp4_nic.c
--- libdhcp-1.27/dhcp4_nic.c.includes	2007-08-10 17:11:34.000000000 -0400
+++ libdhcp-1.27/dhcp4_nic.c	2007-10-23 14:26:27.000000000 -0400
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 
 #include <dhcp4client.h>
-#include <isc_dhcp/dhcpd.h>
+#include <dhcpd.h>
 
 #include "dhcp4_nic.h"
 
diff -up libdhcp-1.27/dhcp4_lease.c.includes libdhcp-1.27/dhcp4_lease.c
--- libdhcp-1.27/dhcp4_lease.c.includes	2007-08-10 17:10:31.000000000 -0400
+++ libdhcp-1.27/dhcp4_lease.c	2007-10-23 14:26:27.000000000 -0400
@@ -32,7 +32,7 @@
 extern void tdestroy (void *root, void (*free_node)(void *nodep));
 #include <stdio.h>
 
-#include <isc_dhcp/dhcpd.h>
+#include <dhcpd.h>
 
 #include "dhcp4_lease.h"
 
diff -up libdhcp-1.27/pump.c.includes libdhcp-1.27/pump.c
--- libdhcp-1.27/pump.c.includes	2007-08-10 17:12:47.000000000 -0400
+++ libdhcp-1.27/pump.c	2007-10-23 14:26:27.000000000 -0400
@@ -82,8 +82,8 @@
 #include <netlink/netlink.h>
 #include <netlink/netlink-kernel.h>
 
-#include <dhcp4client/dhcp4client.h>
-#include <dhcp4client/isc_dhcp/dhcpd.h>
+#include <dhcp4client.h>
+#include <dhcpd.h>
 
 #include "pump.h"
 


Index: libdhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- libdhcp.spec	19 Sep 2007 15:09:00 -0000	1.60
+++ libdhcp.spec	23 Oct 2007 19:26:49 -0000	1.61
@@ -1,16 +1,24 @@
+%define dhcp4ver 12:3.1.0
+%define dhcp6ver 0.10-38
+%define libnlver 1.0-0.10.pre5.4
+
 Summary: A library for network interface configuration with DHCP
 Name:    libdhcp
 Version: 1.27
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group:   Development/Libraries
 URL:     http://dcantrel.fedorapeople.org/%{name}
 
 Source:  http://dcantrel.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
 
+Patch0:  %{name}-1.27-includes.patch
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: dhcp-devel, libdhcp4client-devel >= 12:3.0.4-18
-BuildRequires: libdhcp6client-devel >= 0.10-38, libnl-devel >= 1.0-0.10.pre5.4
+BuildRequires: dhcp-devel >= %{dhcp4ver}
+BuildRequires: libdhcp4client-devel >= %{dhcp4ver}
+BuildRequires: libdhcp6client-devel >= %{dhcp6ver}
+BuildRequires: libnl-devel >= %{libnlver}
 BuildRequires: pkgconfig
 
 %description
@@ -24,7 +32,9 @@
 Summary:  C header files for development with libdhcp
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libdhcp4client-devel, libdhcp6client-devel, libnl-devel
+Requires: libdhcp4client-devel >= %{dhcp4ver}
+Requires: libdhcp6client-devel >= %{dhcp6ver}
+Requires: libnl-devel >= %{libnlver}
 
 %description devel
 C header files for development with libdhcp.
@@ -33,13 +43,15 @@
 Summary:  Static archive of libdhcp
 Group:    Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
-Requires: libdhcp4client-static libdhcp6client-static
+Requires: libdhcp4client-static >= %{dhcp4ver}
+Requires: libdhcp6client-static >= %{dhcp6ver}
 
 %description static
 The libdhcp-static package contains the static archive for libdhcp.
 
 %prep
 %setup -q
+%patch0 -p 1 -b .includes
 
 %build
 %{__make} %{?_smp_mflags}
@@ -71,6 +83,10 @@
 %{_libdir}/libdhcp.a
 
 %changelog
+* Tue Oct 23 2007 David Cantrell <dcantrell at redhat.com> - 1.27-4
+- Patch include paths for isc_dhcp headers
+- Require newer dhcp packages
+
 * Wed Sep 19 2007 David Cantrell <dcantrell at redhat.com> - 1.27-3
 - static package Requires libdhcp6client-static