rpms/evolution-data-server/devel evolution-data-server-1.4.4-ldap-x86_64-hack.patch, NONE, 1.1 evolution-data-server.spec, 1.199, 1.200 evolution-1.4.4-ldap-x86_64-hack.patch, 1.1, NONE

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14071

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.4.4-ldap-x86_64-hack.patch 
Removed Files:
	evolution-1.4.4-ldap-x86_64-hack.patch 
Log Message:

* Thu Jan 17 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.5-3.fc9
- Rename evolution-1.4.4-ldap-x86_64-hack.patch to avoid namespace
  collision with similarly named patch in evolution (RH bug #395551).


evolution-data-server-1.4.4-ldap-x86_64-hack.patch:

--- NEW FILE evolution-data-server-1.4.4-ldap-x86_64-hack.patch ---
--- evolution-1.4.4/configure.ldaphack	2003-08-05 02:06:26.000000000 -0400
+++ evolution-1.4.4/configure	2003-08-05 02:06:45.000000000 -0400
@@ -12135,7 +12135,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
+LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- evolution-data-server.spec	16 Jan 2008 18:35:23 -0000	1.199
+++ evolution-data-server.spec	17 Jan 2008 17:30:33 -0000	1.200
@@ -27,7 +27,7 @@
 
 Name: evolution-data-server
 Version: 2.21.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -37,7 +37,7 @@
 
 ### Patches ###
 
-Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
+Patch10: evolution-data-server-1.4.4-ldap-x86_64-hack.patch
 
 # Remove gnome-common macros from configure.in.
 # We do not ship gnome-common (or at least we're not supposed to).
@@ -379,6 +379,10 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Thu Jan 17 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.5-3.fc9
+- Rename evolution-1.4.4-ldap-x86_64-hack.patch to avoid namespace
+  collision with similarly named patch in evolution (RH bug #395551).
+
 * Wed Jan 16 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.5-2.fc9
 - Add patch for GNOME bug #509644 (password dialog breakage).
 - Remove patch for RH bug #384741 (fixed upstream).


--- evolution-1.4.4-ldap-x86_64-hack.patch DELETED ---