Tue, 28 Aug 2012 18:52:30 +0200
Resynchronize with upstream package maintainer version.
dhcpd/dhcpd.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/dhcpd/dhcpd.spec Wed Feb 08 20:16:20 2012 +0200 1.2 +++ b/dhcpd/dhcpd.spec Tue Aug 28 18:52:30 2012 +0200 1.3 @@ -36,31 +36,27 @@ 1.4 Group: DHCP 1.5 License: ISC/BSD 1.6 Version: %{V_opkg} 1.7 -Release: 20120208 1.8 +Release: 20111211 1.9 1.10 # package options 1.11 %option with_fsl yes 1.12 1.13 # list of sources 1.14 -Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{V_dist}.tar.gz 1.15 +Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{V_dist}/dhcp-%{V_dist}.tar.gz 1.16 Source1: dhcpd.conf 1.17 Source2: rc.dhcpd 1.18 Source3: fsl.dhcpd 1.19 Patch0: dhcpd.patch 1.20 1.21 # build information 1.22 -Prefix: %{l_prefix} 1.23 -BuildRoot: %{l_buildroot} 1.24 -BuildPreReq: OpenPKG, openpkg >= 20060823 1.25 -PreReq: OpenPKG, openpkg >= 20060823 1.26 +BuildPreReq: OpenPKG, openpkg >= 20100101 1.27 +PreReq: OpenPKG, openpkg >= 20100101 1.28 BuildPreReq: openssl 1.29 PreReq: openssl 1.30 %if "%{with_fsl}" == "yes" 1.31 BuildPreReq: fsl 1.32 PreReq: fsl 1.33 %endif 1.34 -AutoReq: no 1.35 -AutoReqProv: no 1.36 1.37 %description 1.38 This is the ISC DHCP daemon reference implementation. 1.39 @@ -69,14 +65,11 @@ 1.40 prog dhcpd = { 1.41 version = %{V_dist} 1.42 url = ftp://ftp.isc.org/isc/dhcp/ 1.43 - regex = dhcp-(\d+\.\d+\.\d+)\.tar\.gz 1.44 + regex = dhcp-(\d+\.\d+\.\d+) 1.45 } 1.46 1.47 %prep 1.48 %setup -q -n dhcp-%{V_dist} 1.49 - ( echo "/* Placeholder to remove conflicting symbol 'struct option' */" 1.50 - echo "/* which is sometimes present in both getopt.h and tree.h */" 1.51 - ) >includes/getopt.h 1.52 %patch -p0 1.53 1.54 %build 1.55 @@ -107,9 +100,6 @@ 1.56 %{l_make} %{l_mflags} 1.57 1.58 %install 1.59 - # clean up build cruft 1.60 - rm -rf $RPM_BUILD_ROOT 1.61 - 1.62 # install program 1.63 %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 1.64 1.65 @@ -118,13 +108,13 @@ 1.66 %{SOURCE dhcpd.conf} \ 1.67 $RPM_BUILD_ROOT%{l_prefix}/etc/dhcpd/dhcpd.conf 1.68 1.69 - # postadjust and strip down installation 1.70 + # post-adjust and strip down installation 1.71 rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/dhclient-script 1.72 rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/dhclient-script.8 1.73 strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true 1.74 strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* 2>/dev/null || true 1.75 1.76 - # install runcommand script 1.77 + # install run-command script 1.78 %{l_shtool} mkdir -f -p -m 755 \ 1.79 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d 1.80 %{l_shtool} install -c -m 755 %{l_value -s -a} \ 1.81 @@ -136,7 +126,7 @@ 1.82 %{SOURCE fsl.dhcpd} \ 1.83 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ 1.84 1.85 - # create runtime directories 1.86 + # create run-time directories 1.87 %{l_shtool} mkdir -f -p -m 755 \ 1.88 $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd/db \ 1.89 $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd/run \ 1.90 @@ -151,7 +141,6 @@ 1.91 %files -f files 1.92 1.93 %clean 1.94 - rm -rf $RPM_BUILD_ROOT 1.95 1.96 %post 1.97 if [ $1 -eq 1 ]; then