diff -r 87d3ada2f769 -r 04069b15fd9c dhcpd/dhcpd.spec
--- a/dhcpd/dhcpd.spec	Wed Feb 08 20:16:20 2012 +0200
+++ b/dhcpd/dhcpd.spec	Tue Aug 28 18:52:30 2012 +0200
@@ -36,31 +36,27 @@
 Group:        DHCP
 License:      ISC/BSD
 Version:      %{V_opkg}
-Release:      20120208
+Release:      20111211
 
 #   package options
 %option       with_fsl  yes
 
 #   list of sources
-Source0:      ftp://ftp.isc.org/isc/dhcp/dhcp-%{V_dist}.tar.gz
+Source0:      ftp://ftp.isc.org/isc/dhcp/dhcp-%{V_dist}/dhcp-%{V_dist}.tar.gz
 Source1:      dhcpd.conf
 Source2:      rc.dhcpd
 Source3:      fsl.dhcpd
 Patch0:       dhcpd.patch
 
 #   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823
-PreReq:       OpenPKG, openpkg >= 20060823
+BuildPreReq:  OpenPKG, openpkg >= 20100101
+PreReq:       OpenPKG, openpkg >= 20100101
 BuildPreReq:  openssl
 PreReq:       openssl
 %if "%{with_fsl}" == "yes"
 BuildPreReq:  fsl
 PreReq:       fsl
 %endif
-AutoReq:      no
-AutoReqProv:  no
 
 %description
     This is the ISC DHCP daemon reference implementation.
@@ -69,14 +65,11 @@
     prog dhcpd = {
         version   = %{V_dist}
         url       = ftp://ftp.isc.org/isc/dhcp/
-        regex     = dhcp-(\d+\.\d+\.\d+)\.tar\.gz
+        regex     = dhcp-(\d+\.\d+\.\d+)
     }
 
 %prep
     %setup -q -n dhcp-%{V_dist}
-    ( echo "/* Placeholder to remove conflicting symbol 'struct option' */"
-      echo "/* which is sometimes present in both getopt.h and tree.h */"
-    ) >includes/getopt.h
     %patch -p0
 
 %build
@@ -107,9 +100,6 @@
     %{l_make} %{l_mflags}
 
 %install
-    #   clean up build cruft
-    rm -rf $RPM_BUILD_ROOT
-
     #   install program
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
 
@@ -118,13 +108,13 @@
         %{SOURCE dhcpd.conf} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/dhcpd/dhcpd.conf
 
-    #   postadjust and strip down installation
+    #   post-adjust and strip down installation
     rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/dhclient-script
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/dhclient-script.8
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/*  2>/dev/null || true
     strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* 2>/dev/null || true
 
-    #   install runcommand script
+    #   install run-command script
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
@@ -136,7 +126,7 @@
         %{SOURCE fsl.dhcpd} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
 
-    #   create runtime directories
+    #   create run-time directories
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd/db \
         $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd/run \
@@ -151,7 +141,6 @@
 %files -f files
 
 %clean
-    rm -rf $RPM_BUILD_ROOT
 
 %post
     if [ $1 -eq 1 ]; then