- build with USE_SOCKET_FALLBACK. Without that dhcp-relay always uses the last interf...

[packages/dhcp.git] / dhcp.spec

diff --git a/dhcp.spec b/dhcp.spec
index 895790c335e0301e46d467f2f4db1541fe1ff657..b49fdb9df80948a8738ca138536f95e9ed2a5cf9 100644 (file)
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -1,19 +1,20 @@
-%bcond_with ldap               # added support for ldap storage
+#
+# Conditional build:
+%bcond_with    ldap    # with support for ldap storage
+#
 Summary:       DHCP Server
-Summary(es):   Servidor DHCP (Protocolo de configuración dinámica de hosts)
+Summary(es):   Servidor DHCP
 Summary(pl):   Serwer DHCP
 Summary(pt_BR):        Servidor DHCP (Protocolo de configuração dinâmica de hosts)
 Name:          dhcp
-Version:       3.0.1
-%define                _rc     rc14
-Release:       0.%{_rc}.2
+Version:       3.0.2
+Release:       2.1
 Epoch:         3
 Vendor:                ISC
 License:       distributable
 Group:         Networking/Daemons
-#Source0:      ftp://ftp.freenet.de/pub/ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
-Source0:       ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}%{_rc}.tar.gz
-# Source0-md5: a68074d9ebdeb355c293d9b3645b3c2c
+Source0:       ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
+# Source0-md5: 04800a111521e7442749b2ce883f962b
 Source1:       %{name}.init
 Source2:       %{name}-relay.init
 Source3:       %{name}-relay.sysconfig
@@ -22,6 +23,7 @@ Source5:      %{name}.sysconfig
 Patch0:                %{name}-if_buffer_size.patch
 Patch1:                %{name}-ldap.patch
 Patch2:                %{name}-ldap1.patch
+Patch3:                %{name}-gcc343-fix.patch
 URL:           http://www.isc.org/sw/dhcp/
 BuildRequires: groff
 %{?with_ldap:BuildRequires:    openldap-devel}
@@ -43,8 +45,7 @@ DHCP permite que hosts en una red TCP/IP soliciten y tengan sus
 direcciones IP alocadas dinámicamente, permite también descubrir
 información sobre la red en que están conectados. BOOTP provee una
 funcionalidad similar, con ciertas restricciones. Este servidor
-también las atiende. Esta versión aún está considerada como un
-software BETA.
+también las atiende.
 
 %description -l pl
 Serwer DHCP (Dynamic Host Configuration Protocol).
@@ -68,6 +69,7 @@ Summary(pl):  Klient DHCP
 Group:         Networking/Daemons
 Requires(post):        fileutils
 Obsoletes:     pump
+Obsoletes:     dhclient
 
 %description client
 Dynamic Host Configuration Protocol Client.
@@ -121,11 +123,12 @@ dhcpctl to zbi
 komunikacji z dzia³aj±cym serwerem ISC DHCP i jego kontroli.
 
 %prep
-%setup -q -n %{name}-%{version}%{_rc}
+%setup -q
 install %{SOURCE4} .
 %patch0 -p1
 %{?with_ldap:%patch1 -p1}
 %{?with_ldap:%patch2 -p1}
+%patch3 -p1
 
 cd doc
 echo "dhcpd complies with the following RFCs:" > rfc-compliance
@@ -138,9 +141,11 @@ cd ..
 #         do not change it to %%configure
 ./configure
 
-%{__make} COPTS="%{rpmcflags} \
+%{__make} \
+       COPTS="%{rpmcflags} \
        -D_PATH_DHCPD_DB=\\\"/var/lib/%{name}/dhcpd.leases\\\" \
-       -D_PATH_DHCLIENT_DB=\\\"/var/lib/%{name}/dhclient.leases\\\"" \
+       -D_PATH_DHCLIENT_DB=\\\"/var/lib/%{name}/dhclient.leases\\\" \
+       -DUSE_SOCKET_FALLBACK" \
        DEBUG="" VARDB="/var/lib/%{name}"
 
 %install
@@ -167,6 +172,7 @@ install -d $RPM_BUILD_ROOT{/sbin,%{_sbindir},%{_bindir},%{_mandir}/man{5,8}} \
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcpd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcp-relay
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/dhcp-relay
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/dhcpd.conf
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/dhcpd
 
 mv $RPM_BUILD_ROOT%{_mandir}/man3/omshell.3 \
@@ -242,6 +248,7 @@ fi
 %{_mandir}/man5/dhcp*
 %{_mandir}/man8/dhcp*
 %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/dhcpd
+%config(noreplace) %verify(not size mtime md5) /etc/dhcpd.conf
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/dhcpd
 %attr(754,root,root) /etc/rc.d/init.d/dhcpd