rpms/evolution-data-server/devel evolution-data-server-2.25.90-libical-includedir.patch, NONE, 1.1 evolution-data-server.spec, 1.247, 1.248

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32615

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-2.25.90-libical-includedir.patch 
Log Message:

* Wed Feb 04 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.90-3.fc11
- Work around libical's broken pkg-config file.


evolution-data-server-2.25.90-libical-includedir.patch:

--- NEW FILE evolution-data-server-2.25.90-libical-includedir.patch ---
diff -up evolution-data-server-2.25.90/calendar/libecal/libecal.pc.in.libical-includedir evolution-data-server-2.25.90/calendar/libecal/libecal.pc.in
--- evolution-data-server-2.25.90/calendar/libecal/libecal.pc.in.libical-includedir	2009-01-27 21:57:57.000000000 -0500
+++ evolution-data-server-2.25.90/calendar/libecal/libecal.pc.in	2009-02-04 12:46:35.000000000 -0500
@@ -9,10 +9,11 @@ idldir=@idldir@
 IDL_INCLUDES=-I${idldir} @IDL_INCLUDES@
 
 privincludedir=@privincludedir@
+libical_includedir=@libical_includedir@
 
 Name: libecal
 Description: Client library for evolution calendars
 Version: @VERSION@
 Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libical >= @LIBICAL_REQUIRED@ libedataserver-1.2
 Libs: -L${libdir} -lecal-1.2
-Cflags: -I${privincludedir}
+Cflags: -I${privincludedir} -I${libical_includedir}
diff -up evolution-data-server-2.25.90/configure.in.libical-includedir evolution-data-server-2.25.90/configure.in
--- evolution-data-server-2.25.90/configure.in.libical-includedir	2009-02-04 12:26:26.000000000 -0500
+++ evolution-data-server-2.25.90/configure.in	2009-02-04 12:46:35.000000000 -0500
@@ -1534,6 +1534,9 @@ dnl --- evolution-calendar flags
 if test "x${enable_calendar}" = "xyes"; then
 	EVOLUTION_CALENDAR_DEPS="libical >= libical_minimum_version libxml-2.0 libbonobo-2.0 gio-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
 
+	libical_includedir=`$PKG_CONFIG --variable=includedir libical`
+	AC_SUBST(libical_includedir)
+
 	EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
 	AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
 	AC_SUBST(EVOLUTION_CALENDAR_LIBS)


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- evolution-data-server.spec	3 Feb 2009 00:53:41 -0000	1.247
+++ evolution-data-server.spec	4 Feb 2009 18:14:23 -0000	1.248
@@ -31,7 +31,7 @@
 
 Name: evolution-data-server
 Version: 2.25.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -56,6 +56,9 @@
 # RH bug #243296
 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+# Work around broken libical.pc
+Patch14: evolution-data-server-2.25.90-libical-includedir.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -138,6 +141,7 @@
 %patch11 -p1 -b .fix-ldap-query
 %patch12 -p1 -b .camel-folder-summary-crash
 %patch13 -p1 -b .fix-64bit-acinclude
+%patch14 -p1 -b .libical-includedir
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -383,6 +387,9 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Wed Feb 04 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.90-3.fc11
+- Work around libical's broken pkg-config file.
+
 * Mon Feb 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.90-2.fc11
 - Forgot the libical requirement in devel subpackage.