# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1316080297 -7200
# Node ID 6aa415912c9b486e9ec27e862b277d9c63410c30
# Parent  4ca17af53013941748329e4d570b22b7c3d2c3f5
Correct conflicting symbol and update to new version of vendor software.

diff -r 4ca17af53013 -r 6aa415912c9b dhcpd/dhcpd.spec
--- a/dhcpd/dhcpd.spec	Thu Sep 15 11:49:33 2011 +0200
+++ b/dhcpd/dhcpd.spec	Thu Sep 15 11:51:37 2011 +0200
@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_opkg 4.2.1
-%define       V_dist 4.2.1
+%define       V_opkg 4.2.2
+%define       V_dist 4.2.2
 
 #   package information
 Name:         dhcpd
@@ -36,7 +36,7 @@
 Group:        DHCP
 License:      ISC/BSD
 Version:      %{V_opkg}
-Release:      20110424
+Release:      20110914
 
 #   package options
 %option       with_fsl  yes
@@ -74,6 +74,9 @@
 
 %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