rpms/dhcp/devel .cvsignore, 1.30, 1.31 dhcp.spec, 1.290, 1.291 sources, 1.32, 1.33

[Jiří Popelka]

Author: jpopelka

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15090

Modified Files:
	.cvsignore dhcp.spec sources 
Log Message:
* Tue Feb 16 2010 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.1-7
- ldap-for-dhcp-4.1.1-2 (#564810)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	20 Jan 2010 17:04:15 -0000	1.30
+++ .cvsignore	16 Feb 2010 17:47:16 -0000	1.31
@@ -1,2 +1,2 @@
 dhcp-4.1.1.tar.gz
-ldap-for-dhcp-4.1.1-1.tar.gz
+ldap-for-dhcp-4.1.1-2.tar.gz


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- dhcp.spec	16 Feb 2010 11:06:49 -0000	1.290
+++ dhcp.spec	16 Feb 2010 17:47:17 -0000	1.291
@@ -8,12 +8,12 @@
 %global basever 4.1.1
 
 # LDAP patch version
-%global ldappatchver %{basever}-1
+%global ldappatchver %{basever}-2
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}
-Release:  6%{?dist}
+Release:  7%{?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.
@@ -208,9 +208,6 @@ libdhcpctl and libomapi static libraries
 # with multiple dhclients running easier (#546792)
 %patch21 -p1 -b .logpid
 
-# implicit DSO linking (remove this patch when upstream fix this in ldap-for-dhcp)
-%patch22 -p1 -b .DSO
-
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
@@ -504,6 +501,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Tue Feb 16 2010 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.1-7
+- ldap-for-dhcp-4.1.1-2 (#564810)
+
 * Tue Feb 16 2010 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.1-6
 - Fix ldap patch to explicitly link with liblber (#564810)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	20 Jan 2010 17:04:16 -0000	1.32
+++ sources	16 Feb 2010 17:47:17 -0000	1.33
@@ -1,2 +1,2 @@
 38a74c89d8913b9b5f33737047623c18  dhcp-4.1.1.tar.gz
-1a99ffb11c00a603ce2146f7d13ab967  ldap-for-dhcp-4.1.1-1.tar.gz
+9fa2f64826c969a55fd28263e4b6cad6  ldap-for-dhcp-4.1.1-2.tar.gz