- skip if appropriate network family is disabled

[packages/dhcp.git] / dhcp.spec

diff --git a/dhcp.spec b/dhcp.spec
index ad3f19e7cc87a7729f8fcd914f0d763bf395362c..a07da4dc8b54c3aa642aa41d2df91c84979d96c1 100644 (file)
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -12,14 +12,13 @@ Summary(pl.UTF-8):  Serwer DHCP
 Summary(pt_BR.UTF-8):  Servidor DHCP (Protocolo de configuração dinâmica de hosts)
 Name:          dhcp
 # 4.1.0a1 is on DEVEL
-Version:       4.0.0
-# don't put int release until all patches are updated/ported(!)
-Release:       0.1
+Version:       4.0.1p1
+Release:       1
 Epoch:         4
 License:       MIT
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
-# Source0-md5: 31d79b27ce4a94089a0b9ce7f72307fa
+# Source0-md5: 42bac85e1513e177c6bb2bf64d448dbe
 Source1:       %{name}.init
 Source2:       %{name}6.init
 Source3:       %{name}-relay.init
@@ -34,30 +33,29 @@ Source11:   %{name}-README.ldap
 Source12:      draft-ietf-dhc-ldap-schema-01.txt
 Source13:      dhcpd-conf-to-ldap
 Source14:      dhcp-dhclient-script
-Patch0:                %{name}-dhclient.script.patch
-Patch1:                %{name}-release-by-ifup.patch
+Patch0:                %{name}-release-by-ifup.patch
 # from fedora 9-dev
-Patch2:                %{name}-ldap.patch
-Patch3:                %{name}-client-script-redhat.patch
-Patch4:                %{name}-3.0.3-x-option.patch
-Patch5:                %{name}-paths.patch
-Patch6:                %{name}-arg-concat.patch
-Patch8:                %{name}-timeouts.patch
-Patch9:                %{name}-options.patch
-Patch10:       %{name}-libdhcp4client.patch
-Patch11:       %{name}-prototypes.patch
-Patch12:       %{name}-errwarn-message.patch
-Patch13:       %{name}-memory.patch
-Patch14:       %{name}-dhclient-decline-backoff.patch
-Patch15:       %{name}-unicast-bootp.patch
-Patch16:       %{name}-fast-timeout.patch
-Patch17:       %{name}-failover-ports.patch
-Patch18:       %{name}-dhclient-usage.patch
-Patch19:       %{name}-default-requested-options.patch
-Patch20:       %{name}-xen-checksum.patch
-Patch21:       %{name}-dhclient-anycast.patch
-Patch22:       %{name}-manpages.patch
-Patch23:       %{name}-NetworkManager-crash.patch
+Patch1:                %{name}-ldap.patch
+Patch2:                %{name}-3.0.3-x-option.patch
+Patch3:                %{name}-paths.patch
+Patch4:                %{name}-arg-concat.patch
+Patch5:                %{name}-timeouts.patch
+Patch6:                %{name}-options.patch
+Patch7:                %{name}-libdhcp4client.patch
+Patch8:                %{name}-prototypes.patch
+Patch9:                %{name}-errwarn-message.patch
+Patch10:       %{name}-memory.patch
+Patch11:       %{name}-dhclient-decline-backoff.patch
+Patch12:       %{name}-unicast-bootp.patch
+Patch13:       %{name}-fast-timeout.patch
+Patch14:       %{name}-failover-ports.patch
+Patch15:       %{name}-dhclient-usage.patch
+Patch16:       %{name}-default-requested-options.patch
+Patch17:       %{name}-xen-checksum.patch
+Patch18:       %{name}-dhclient-anycast.patch
+Patch19:       %{name}-manpages.patch
+Patch20:       %{name}-NetworkManager-crash.patch
+Patch21:       %{name}-no-ipv6.patch
 URL:           http://www.isc.org/sw/dhcp/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -218,19 +216,20 @@ Statyczna biblioteka kliencka DHCP.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%{?with_ldap:%patch2 -p1}
-# These two patches are required for dhcdbd to function
-%patch3 -p1
+%{?with_ldap:%patch1 -p1}
+# This patch is required for dhcdbd to function
 # CHECK ME: adds -x (formerly -y):
 #The -x argument enables extended option information to be created in the
 #-s dhclient-script environment, which would allow applications running
 #in that environment to handle options they do not know about in advance -
 #this is a Red Hat extension to support dhcdbd and NetworkManager.
 # however, fedora doesn't have this patch anymore, so can drop?
-#%%patch4 -p1
+#%%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
@@ -245,8 +244,6 @@ Statyczna biblioteka kliencka DHCP.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
-%patch22 -p1
-%patch23 -p1
 
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 cp -a %{SOURCE11} README.ldap
@@ -280,7 +277,7 @@ for page in server/dhcpd.conf.5 server/dhcpd.leases.5 server/dhcpd.8; do
                                -e 's|ETCDIR|%{_sysconfdir}|g' $page
 done
 
-sed 's/@DHCP_VERSION@/'%{version}'/' < %{SOURCE5} > libdhcp4client.pc
+sed 's/@DHCP_VERSION@/'%{version}'/' < %{SOURCE6} > libdhcp4client.pc
 
 %build
 %{__libtoolize}
@@ -288,7 +285,7 @@ sed 's/@DHCP_VERSION@/'%{version}'/' < %{SOURCE5} > libdhcp4client.pc
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-CFLAGS="%{rpmcflags} -fPIC"
+CFLAGS="%{rpmcflags} -fPIC -D_GNU_SOURCE=1"
 %configure \
        %{!?with_static_libs:--disable-static} \
        --enable-dhcpv6 \
@@ -321,6 +318,8 @@ install %{SOURCE10} $RPM_BUILD_ROOT%{schemadir}
 %endif
 
 # Install headers for libdhcp4client-devel
+install -d $RPM_BUILD_ROOT%{_includedir}/dhcp4client
+install libdhcp4client/dhcp4client.h $RPM_BUILD_ROOT%{_includedir}/dhcp4client/dhcp4client.h
 install -d $RPM_BUILD_ROOT%{_includedir}/dhcp4client/minires
 for hdr in cdefs.h ctrace.h dhcp.h dhcp6.h dhcpd.h dhctoken.h failover.h \
            heap.h inet.h minires/minires.h minires/res_update.h \
@@ -328,7 +327,7 @@ for hdr in cdefs.h ctrace.h dhcp.h dhcp6.h dhcpd.h dhctoken.h failover.h \
        install -p -m 0644 includes/${hdr} $RPM_BUILD_ROOT%{_includedir}/dhcp4client/${hdr}
 done
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/dhclient.conf
+:> $RPM_BUILD_ROOT%{_sysconfdir}/dhclient.conf
 
 touch $RPM_BUILD_ROOT/var/lib/dhcpd/dhcpd.leases
 touch $RPM_BUILD_ROOT/var/lib/dhclient/dhclient.leases
@@ -365,6 +364,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 touch /var/lib/dhcpd/dhcpd.leases
+touch /var/lib/dhcpd/dhcpd6.leases
 /sbin/chkconfig --add dhcpd
 %service dhcpd restart "dhcpd daemon"
 /sbin/chkconfig --add dhcpd6