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

[Matthew Barnes]

Author: mbarnes

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

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

* Wed Feb 04 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.90-4.fc11
- ... and fix our own <ical.h> includes too.


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

Index: evolution-data-server-2.25.90-libical-includedir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server-2.25.90-libical-includedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-data-server-2.25.90-libical-includedir.patch	4 Feb 2009 18:14:23 -0000	1.1
+++ evolution-data-server-2.25.90-libical-includedir.patch	4 Feb 2009 20:10:48 -0000	1.2
@@ -1,6 +1,66 @@
+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:46:35.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@
  
@@ -14,9 +74,45 @@
  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:26:26.000000000 -0500
-+++ evolution-data-server-2.25.90/configure.in	2009-02-04 12:46:35.000000000 -0500
+--- 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"


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- evolution-data-server.spec	4 Feb 2009 18:14:23 -0000	1.248
+++ evolution-data-server.spec	4 Feb 2009 20:10:48 -0000	1.249
@@ -31,7 +31,7 @@
 
 Name: evolution-data-server
 Version: 2.25.90
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -387,6 +387,9 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Wed Feb 04 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.90-4.fc11
+- ... and fix our own <ical.h> includes too.
+
 * Wed Feb 04 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.90-3.fc11
 - Work around libical's broken pkg-config file.