X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dhcp.spec;h=44f005ab4b89385091c4575f6fb3c31c3bcc64dd;hb=f7d75131f5e7d8dfd394ca85d63c2b8d4138b0f2;hp=9cc72420f936ead8c77971234733174b3bc1ec5d;hpb=5eb60a7e2bbcfb8f832f7011dd4d448bfbc89f3c;p=packages%2Fdhcp.git

diff --git a/dhcp.spec b/dhcp.spec
index 9cc7242..44f005a 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -1,24 +1,31 @@
+#
+# 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.1rc11
+Version:	3.0.3
 Release:	2
-Epoch:		2
+Epoch:		3
 Vendor:		ISC
 License:	distributable
 Group:		Networking/Daemons
-# Source0:	ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
-Source0:	ftp://ftp.freenet.de/pub/ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
-# Source0-md5:	af79b0453ac67fb6824247d3d48fff91
+Source0:	ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
+# Source0-md5:	f91416a0b8ed3fd0601688cf0b7df58f
 Source1:	%{name}.init
 Source2:	%{name}-relay.init
 Source3:	%{name}-relay.sysconfig
 Source4:	%{name}d.conf.sample
 Source5:	%{name}.sysconfig
 Patch0:		%{name}-if_buffer_size.patch
+Patch1:		%{name}-ldap.patch
+Patch2:		%{name}-ldap1.patch
+URL:		http://www.isc.org/sw/dhcp/
 BuildRequires:	groff
+%{?with_ldap:BuildRequires:	openldap-devel}
 PreReq:		rc-scripts >= 0.2.0
 Requires(post,preun):	/sbin/chkconfig
 Requires(post):	fileutils
@@ -37,8 +44,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).
@@ -62,6 +68,7 @@ Summary(pl):	Klient DHCP
 Group:		Networking/Daemons
 Requires(post):	fileutils
 Obsoletes:	pump
+Obsoletes:	dhclient
 
 %description client
 Dynamic Host Configuration Protocol Client.
@@ -118,6 +125,8 @@ komunikacji z dzia
 %setup -q
 install %{SOURCE4} .
 %patch0 -p1
+%{?with_ldap:%patch1 -p1}
+%{?with_ldap:%patch2 -p1}
 
 cd doc
 echo "dhcpd complies with the following RFCs:" > rfc-compliance
@@ -130,9 +139,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
@@ -159,6 +170,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 \
@@ -229,10 +241,12 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc doc/* README RELNOTES dhcpd.conf.sample
+%{?with_ldap:%doc contrib/*}
 %{_mandir}/man1/*
 %{_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