rpms/dhcp/devel dhcp.spec,1.206,1.207 linux,1.11,1.12

David Cantrell (dcantrel) fedora-extras-commits at redhat.com
Wed Mar 26 04:54:29 UTC 2008


Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21885

Modified Files:
	dhcp.spec linux 
Log Message:
* Tue Mar 25 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-13
- Update dhclient-script to handle domain-search correctly (#437840)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- dhcp.spec	26 Mar 2008 04:40:04 -0000	1.206
+++ dhcp.spec	26 Mar 2008 04:53:54 -0000	1.207
@@ -4,7 +4,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  4.0.0
-Release:  12%{?dist}
+Release:  13%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -414,6 +414,9 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Tue Mar 25 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-13
+- Update dhclient-script to handle domain-search correctly (#437840)
+
 * Tue Mar 25 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-12
 - Remove Requires on openldap-server (#432180)
 - Replace CLIENTBINDIR, ETCDIR, DBDIR, and RUNDIR in the man pages with the


Index: linux
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/linux,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux	8 Feb 2008 02:15:14 -0000	1.11
+++ linux	26 Mar 2008 04:53:54 -0000	1.12
@@ -47,8 +47,8 @@
         rscf=`mktemp /tmp/XXXXXX`;
         echo '; generated by /sbin/dhclient-script' > $rscf
 
-        if [ -n "$SEARCH" ]; then
-            echo search $SEARCH >> $rscf
+        if [ -n "$new_domain_search" ]; then
+            echo search $new_domain_search >> $rscf
         else
             if [ -n "$new_domain_name" ]; then
                 echo search $new_domain_name >> $rscf




More information about the fedora-extras-commits mailing list