- Update to 2.25.91

.cvsignore

@@ -1 +1 @@
-evolution-data-server-2.25.90.tar.bz2
+evolution-data-server-2.25.91.tar.bz2

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

@@ -1,125 +0,0 @@
-diff -up evolution-data-server-2.25.90/calendar/libecal/e-cal-check-timezones.c.libical-includedir evolution-data-server-2.25.90/calendar/libecal/e-cal-check-timezones.c
---- evolution-data-server-2.25.90/calendar/libecal/e-cal-check-timezones.c.libical-includedir	2009-02-04 15:00:36.000000000 -0500
-+++ evolution-data-server-2.25.90/calendar/libecal/e-cal-check-timezones.c	2009-02-04 15:01:12.000000000 -0500
-@@ -17,7 +17,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-  */
- 
--#include <ical.h>
-+#include <libical/ical.h>
- 
- #include "e-cal-check-timezones.h"
- #include <libecal/e-cal.h>
-diff -up evolution-data-server-2.25.90/calendar/libecal/e-cal-check-timezones.h.libical-includedir evolution-data-server-2.25.90/calendar/libecal/e-cal-check-timezones.h
---- evolution-data-server-2.25.90/calendar/libecal/e-cal-check-timezones.h.libical-includedir	2009-02-04 15:00:36.000000000 -0500
-+++ evolution-data-server-2.25.90/calendar/libecal/e-cal-check-timezones.h	2009-02-04 15:01:16.000000000 -0500
-@@ -20,7 +20,7 @@
- #ifndef E_CAL_CHECK_TIMEZONES_H
- #define E_CAL_CHECK_TIMEZONES_H
- 
--#include <ical.h>
-+#include <libical/ical.h>
- #include <glib.h>
- 
- G_BEGIN_DECLS
-diff -up evolution-data-server-2.25.90/calendar/libecal/e-cal-component.h.libical-includedir evolution-data-server-2.25.90/calendar/libecal/e-cal-component.h
---- evolution-data-server-2.25.90/calendar/libecal/e-cal-component.h.libical-includedir	2009-02-04 15:00:36.000000000 -0500
-+++ evolution-data-server-2.25.90/calendar/libecal/e-cal-component.h	2009-02-04 15:01:28.000000000 -0500
-@@ -23,7 +23,7 @@
- 
- #include <time.h>
- #include <glib-object.h>
--#include <ical.h>
-+#include <libical/ical.h>
- 
- G_BEGIN_DECLS
- 
-diff -up evolution-data-server-2.25.90/calendar/libecal/e-cal-time-util.h.libical-includedir evolution-data-server-2.25.90/calendar/libecal/e-cal-time-util.h
---- evolution-data-server-2.25.90/calendar/libecal/e-cal-time-util.h.libical-includedir	2009-02-04 15:00:36.000000000 -0500
-+++ evolution-data-server-2.25.90/calendar/libecal/e-cal-time-util.h	2009-02-04 15:01:24.000000000 -0500
-@@ -13,7 +13,7 @@
- 
- 
- #include <time.h>
--#include <ical.h>
-+#include <libical/ical.h>
- #include <glib.h>
- 
- G_BEGIN_DECLS
-diff -up evolution-data-server-2.25.90/calendar/libecal/e-cal-util.h.libical-includedir evolution-data-server-2.25.90/calendar/libecal/e-cal-util.h
---- evolution-data-server-2.25.90/calendar/libecal/e-cal-util.h.libical-includedir	2009-02-04 15:00:36.000000000 -0500
-+++ evolution-data-server-2.25.90/calendar/libecal/e-cal-util.h	2009-02-04 15:01:20.000000000 -0500
-@@ -21,7 +21,7 @@
- #ifndef E_CAL_UTIL_H
- #define E_CAL_UTIL_H
- 
--#include <ical.h>
-+#include <libical/ical.h>
- #include <time.h>
- #include <glib.h>
- #include <libecal/e-cal-component.h>
-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:48:36.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/calendar/libedata-cal/e-data-cal.c.libical-includedir evolution-data-server-2.25.90/calendar/libedata-cal/e-data-cal.c
---- evolution-data-server-2.25.90/calendar/libedata-cal/e-data-cal.c.libical-includedir	2009-02-04 15:00:36.000000000 -0500
-+++ evolution-data-server-2.25.90/calendar/libedata-cal/e-data-cal.c	2009-02-04 15:01:08.000000000 -0500
-@@ -23,7 +23,7 @@
- #include <config.h>
- #endif
- 
--#include <ical.h>
-+#include <libical/ical.h>
- #include <bonobo/bonobo-main.h>
- #include <bonobo/bonobo-exception.h>
- #include <libedata-cal/e-cal-backend.h>
-diff -up evolution-data-server-2.25.90/calendar/libedata-cal/e-data-cal-factory.h.libical-includedir evolution-data-server-2.25.90/calendar/libedata-cal/e-data-cal-factory.h
---- evolution-data-server-2.25.90/calendar/libedata-cal/e-data-cal-factory.h.libical-includedir	2009-02-04 15:00:36.000000000 -0500
-+++ evolution-data-server-2.25.90/calendar/libedata-cal/e-data-cal-factory.h	2009-02-04 15:01:03.000000000 -0500
-@@ -22,7 +22,7 @@
- #define E_DATA_CAL_FACTORY_H
- 
- #include <bonobo/bonobo-object.h>
--#include <ical.h>
-+#include <libical/ical.h>
- #include <libedata-cal/Evolution-DataServer-Calendar.h>
- #include <libedata-cal/e-cal-backend-loader-factory.h>
- 
-diff -up evolution-data-server-2.25.90/calendar/tests/ecal/test-ecal.c.libical-includedir evolution-data-server-2.25.90/calendar/tests/ecal/test-ecal.c
---- evolution-data-server-2.25.90/calendar/tests/ecal/test-ecal.c.libical-includedir	2009-02-04 15:00:36.000000000 -0500
-+++ evolution-data-server-2.25.90/calendar/tests/ecal/test-ecal.c	2009-02-04 15:00:59.000000000 -0500
-@@ -27,7 +27,7 @@
- #include <libecal/e-cal.h>
- #include <libecal/e-cal-component.h>
- #include <libecal/e-cal-time-util.h>
--#include <ical.h>
-+#include <libical/ical.h>
- 
- /* start_testing_scaffold */
- #define mu_assert(message, test) do { if (!(test)) return message; else { tests_passed++; return NULL;}} while (0)
-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:48:36.000000000 -0500
-+++ evolution-data-server-2.25.90/configure.in	2009-02-04 12:48:36.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)

evolution-data-server.spec

@@ -30,8 +30,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.25.90
+Version: 2.25.91
-Release: 5%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -53,9 +53,6 @@ Patch11: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
 # RH bug #243296
 Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-# Work around broken libical.pc
-Patch13: evolution-data-server-2.25.90-libical-includedir.patch
-
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -138,7 +135,6 @@ This package contains developer documentation for %{name}.
 %patch10 -p1 -b .fix-ldap-query
 %patch11 -p1 -b .camel-folder-summary-crash
 %patch12 -p1 -b .fix-64bit-acinclude
-%patch13 -p1 -b .libical-includedir
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -384,6 +380,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Feb 16 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.91-1.fc11
+- Update to 2.25.91
+
 * Fri Feb 06 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.90-5.fc11
 - Update BuildRoot, License, Source and URL tags.
 - Require gnome-common so we don't have to patch it out.

sources

@@ -1 +1 @@
-3fe170914f4c12031fa29d023cc6b6ea  evolution-data-server-2.25.90.tar.bz2
+f994db97bb33fcdb5a6f8f126ea15716  evolution-data-server-2.25.91.tar.bz2