SPECS: dhcp.spec - rel 0.2 - separate paths for dhcpd.leases and d...

[baggins]

Author: baggins                      Date: Mon Apr 16 11:22:15 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 0.2
- separate paths for dhcpd.leases and dhclient.leases so client package
  does not require server packege now due to dir dependency

---- Files affected:
SPECS:
   dhcp.spec (1.134 -> 1.135) 

---- Diffs:

================================================================
Index: SPECS/dhcp.spec
diff -u SPECS/dhcp.spec:1.134 SPECS/dhcp.spec:1.135
--- SPECS/dhcp.spec:1.134	Tue Apr  3 15:27:37 2007
+++ SPECS/dhcp.spec	Mon Apr 16 13:22:09 2007
@@ -9,7 +9,7 @@
 Summary(pt_BR.UTF-8):	Servidor DHCP (Protocolo de configuração dinâmica de hosts)
 Name:		dhcp
 Version:	3.1.0a3
-Release:	0.1
+Release:	0.2
 Epoch:		4
 License:	distributable
 Group:		Networking/Daemons
@@ -27,6 +27,7 @@
 Patch4:		%{name}-3.0.3-x-option.patch
 Patch5:		%{name}-typo.patch
 Patch6:		%{name}-arg-concat.patch
+Patch7:		%{name}-split-VARDB.patch
 URL:		http://www.isc.org/sw/dhcp/
 BuildRequires:	groff
 %{?with_ldap:BuildRequires:	openldap-devel}
@@ -137,6 +138,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 # NOTE: this is not autoconf configure - do not change it to %%configure
@@ -147,11 +149,12 @@
 	CC_OPTIONS="%{rpmcflags} \
 		-D_PATH_DHCPD_DB=\\\"/var/lib/%{name}/dhcpd.leases\\\" \
 		-DEXTENDED_NEW_OPTION_INFO \
-		-D_PATH_DHCLIENT_DB=\\\"/var/lib/%{name}/dhclient.leases\\\" \
+		-D_PATH_DHCLIENT_DB=\\\"/var/lib/dhclient/dhclient.leases\\\" \
 	"
 	LFLAGS="%{rpmldflags}" \
 	DEBUG="" \
-	VARDB="/var/lib/%{name}"
+	VARDBS="/var/lib/%{name}"
+	VARDBC="/var/lib/dhclient"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -171,7 +174,8 @@
 	LIBMANEXT=.3 \
 	USRMANDIR=%{_mandir}/man1 \
 	USRMANEXT=.1 \
-	VARDB=/var/lib/%{name} \
+	VARDBS=/var/lib/%{name} \
+	VARDBC=/var/lib/dhclient \
 	FFMANEXT=.5
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcpd
@@ -185,7 +189,8 @@
 
 install client/scripts/linux $RPM_BUILD_ROOT%{_sbindir}/dhclient-script
 
-touch $RPM_BUILD_ROOT/var/lib/%{name}/{dhcpd,dhclient}.leases
+touch $RPM_BUILD_ROOT/var/lib/%{name}/dhcpd.leases
+touch $RPM_BUILD_ROOT/var/lib/dhclient/dhclient.leases
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -202,9 +207,8 @@
 fi
 
 %post client
-# TODO: fix this
-if [ ! -d /var/lib/dhcp ]; then
-	install -d /var/lib/dhcp
+if [ -f /var/lib/dhcp/dhclient.leases.rpmsave ]; then
+	mv /var/lib/dhcp/dhclient.leases.rpmsave /var/lib/dhclient/dhclient.leases
 fi
 
 %post relay
@@ -249,7 +253,8 @@
 %attr(755,root,root) /sbin/dhclient
 %attr(755,root,root) /sbin/dhclient-script
 %{_mandir}/man[58]/dhclient*
-%ghost /var/lib/%{name}/dhclient.leases
+%attr(750,root,root) %dir /var/lib/dhclient
+%ghost /var/lib/dhclient/dhclient.leases
 
 %files relay
 %defattr(644,root,root,755)
@@ -270,6 +275,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135  2007/04/16 11:22:09  baggins
+- rel 0.2
+- separate paths for dhcpd.leases and dhclient.leases so client package
+  does not require server packege now due to dir dependency
+
 Revision 1.134  2007/04/03 13:27:37  jajcus
 - LICENSE added to %doc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dhcp.spec?r1=1.134&r2=1.135&f=u