SPECS: dhcp.spec - -DUSE_SOCKET_FALLBACK already in osdeps.h

glen glen at pld-linux.org
Wed Nov 1 18:53:42 CET 2006


Author: glen                         Date: Wed Nov  1 17:53:42 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- -DUSE_SOCKET_FALLBACK already in osdeps.h

---- Files affected:
SPECS:
   dhcp.spec (1.123 -> 1.124) 

---- Diffs:

================================================================
Index: SPECS/dhcp.spec
diff -u SPECS/dhcp.spec:1.123 SPECS/dhcp.spec:1.124
--- SPECS/dhcp.spec:1.123	Wed Nov  1 18:51:12 2006
+++ SPECS/dhcp.spec	Wed Nov  1 18:53:37 2006
@@ -2,7 +2,6 @@
 #
 # Conditional build:
 %bcond_with	ldap	# with support for ldap storage
-%bcond_with	socket_fallback	# add support so dhcp is able to work on kernels without CONFIG_PACKET (Packet socket) and CONFIG_FILTER (Socket Filtering) 
 #
 Summary:	DHCP Server
 Summary(es):	Servidor DHCP
@@ -140,8 +139,7 @@
 %patch6 -p1
 
 %build
-# Notice: this is not autoconf configure!!!!!!!
-#         do not change it to %%configure
+# NOTE: this is not autoconf configure - do not change it to %%configure
 ./configure
 
 %{__make} \
@@ -150,7 +148,6 @@
 		-D_PATH_DHCPD_DB=\\\"/var/lib/%{name}/dhcpd.leases\\\" \
 		-DEXTENDED_NEW_OPTION_INFO \
 		-D_PATH_DHCLIENT_DB=\\\"/var/lib/%{name}/dhclient.leases\\\" \
-		%{?with_socket_fallback:-DUSE_SOCKET_FALLBACK} \
 	"
 	LFLAGS="%{rpmldflags}" \
 	DEBUG="" \
@@ -196,9 +193,6 @@
 %post
 /sbin/chkconfig --add dhcpd
 touch /var/lib/%{name}/dhcpd.leases
-if [ ! -d /var/lib/dhcp ]; then
-	install -d /var/lib/dhcp
-fi
 %service dhcpd restart "dhcpd daemon"
 
 %preun
@@ -208,6 +202,7 @@
 fi
 
 %post client
+# TODO: fix this
 if [ ! -d /var/lib/dhcp ]; then
 	install -d /var/lib/dhcp
 fi
@@ -275,6 +270,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2006/11/01 17:53:37  glen
+- -DUSE_SOCKET_FALLBACK already in osdeps.h
+
 Revision 1.123  2006/11/01 17:51:12  glen
 - add socket fallback bcond
 
================================================================

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



More information about the pld-cvs-commit mailing list