1.1 --- a/dhcpd/dhcpd.spec Thu Sep 15 11:49:33 2011 +0200 1.2 +++ b/dhcpd/dhcpd.spec Thu Sep 15 11:51:37 2011 +0200 1.3 @@ -22,8 +22,8 @@ 1.4 ## 1.5 1.6 # package version 1.7 -%define V_opkg 4.2.1 1.8 -%define V_dist 4.2.1 1.9 +%define V_opkg 4.2.2 1.10 +%define V_dist 4.2.2 1.11 1.12 # package information 1.13 Name: dhcpd 1.14 @@ -36,7 +36,7 @@ 1.15 Group: DHCP 1.16 License: ISC/BSD 1.17 Version: %{V_opkg} 1.18 -Release: 20110424 1.19 +Release: 20110914 1.20 1.21 # package options 1.22 %option with_fsl yes 1.23 @@ -74,6 +74,9 @@ 1.24 1.25 %prep 1.26 %setup -q -n dhcp-%{V_dist} 1.27 + ( echo "/* Placeholder to remove conflicting symbol 'struct option' */" 1.28 + echo "/* which is sometimes present in both getopt.h and tree.h */" 1.29 + ) >includes/getopt.h 1.30 %patch -p0 1.31 1.32 %build