diff -r 01c515740aeb -r dabc4f22486f dhcpd/dhcpd.spec
--- a/dhcpd/dhcpd.spec	Tue Jan 06 23:45:10 2009 +0100
+++ b/dhcpd/dhcpd.spec	Tue Jan 06 23:46:19 2009 +0100
@@ -32,7 +32,7 @@
 Group:        DHCP
 License:      ISC/BSD
 Version:      4.1.0
-Release:      20081220
+Release:      20090105
 
 #   package options
 %option       with_fsl  yes
@@ -75,6 +75,12 @@
         -e 's;^[^#]*\(#define[^_]*_PATH_DHCPD_DB[^"]*\).*;\1 "%{l_prefix}/var/dhcpd/db/dhcpd.leases";' \
         -e 's;^[^#]*\(#define[^_]*_PATH_DHCPD_CONF[^"]*\).*;\1 "%{l_prefix}/etc/dhcpd/dhcpd.conf";' \
         includes/site.h
+    %{l_shtool} subst \
+        -e 's;struct option\([, )]\);struct option_dhcpd\1;g' \
+        includes/*.h \
+        client/*.c \
+        common/*.c \
+        server/*.c
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags} -DNOMINUM" \
@@ -85,6 +91,7 @@
         --mandir=%{l_prefix}/man \
         --sysconfdir=%{l_prefix}/etc/dhcpd \
         --localstatedir=%{l_prefix}/var/dhcpd \
+        --disable-dhcpv6 \
         --with-srv-lease-file=%{l_prefix}/var/dhcpd/db/dhcpd.leases \
         --with-cli-lease-file=%{l_prefix}/var/dhcpd/db/dhclient.leases \
         --with-srv-pid-file=%{l_prefix}/var/dhcpd/run/dhcpd.pid \