From 933b965cda14a30c437ae91a2140fff53bfc6500 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: May 13 2008 17:11:55 +0000
Subject: - Fix some third-party package breakage caused by libebackend.


---

diff --git a/evolution-data-server-2.23.2-libebackend-breakage.patch b/evolution-data-server-2.23.2-libebackend-breakage.patch
new file mode 100644
index 0000000..f2a2cac
--- /dev/null
+++ b/evolution-data-server-2.23.2-libebackend-breakage.patch
@@ -0,0 +1,32 @@
+diff -up evolution-data-server-2.23.2/addressbook/libedata-book/libedata-book.pc.in.libebackend-breakage evolution-data-server-2.23.2/addressbook/libedata-book/libedata-book.pc.in
+--- evolution-data-server-2.23.2/addressbook/libedata-book/libedata-book.pc.in.libebackend-breakage	2008-04-11 07:10:27.000000000 -0400
++++ evolution-data-server-2.23.2/addressbook/libedata-book/libedata-book.pc.in	2008-05-13 12:52:00.000000000 -0400
+@@ -13,6 +13,6 @@ privincludedir=@privincludedir@
+ Name: libedatabook
+ Description: Backend library for evolution address books
+ Version: @VERSION@
+-Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.2 libebook-1.2
++Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.2 libebackend-1.2 libebook-1.2
+ Libs: -L${libdir} -ledata-book-1.2
+ Cflags: -I${privincludedir}
+diff -up evolution-data-server-2.23.2/calendar/libedata-cal/libedata-cal.pc.in.libebackend-breakage evolution-data-server-2.23.2/calendar/libedata-cal/libedata-cal.pc.in
+--- evolution-data-server-2.23.2/calendar/libedata-cal/libedata-cal.pc.in.libebackend-breakage	2008-04-18 01:48:20.000000000 -0400
++++ evolution-data-server-2.23.2/calendar/libedata-cal/libedata-cal.pc.in	2008-05-13 12:52:00.000000000 -0400
+@@ -13,6 +13,6 @@ privincludedir=@privincludedir@
+ Name: libedata-cal
+ Description: Backend library for evolution calendars
+ Version: @VERSION@
+-Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libedataserver-1.2 libecal-1.2 gio-2.0
++Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libedataserver-1.2 libebackend-1.2 libecal-1.2 gio-2.0
+ Libs: -L${libdir} -ledata-cal-1.2 -lecal-1.2
+ Cflags: -I${privincludedir}
+diff -up evolution-data-server-2.23.2/libebackend/libebackend.pc.in.libebackend-breakage evolution-data-server-2.23.2/libebackend/libebackend.pc.in
+--- evolution-data-server-2.23.2/libebackend/libebackend.pc.in.libebackend-breakage	2008-05-12 01:33:56.000000000 -0400
++++ evolution-data-server-2.23.2/libebackend/libebackend.pc.in	2008-05-13 12:51:59.000000000 -0400
+@@ -11,5 +11,5 @@ Name: libebackend
+ Description: Utility library for Evolution Data Server Backends
+ Version: @VERSION@
+ Requires: glib-2.0
+-Libs: -L${libdir} -lbackend-@API_VERSION@
++Libs: -L${libdir} -lebackend-@API_VERSION@
+ Cflags: -I${privincludedir}
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 57b67ff..47b74a9 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -28,7 +28,7 @@
 
 Name: evolution-data-server
 Version: 2.23.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -50,6 +50,9 @@ Patch12: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
 # RH bug #243296
 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+# Fix some typos and oversights related to libebackend
+Patch14: evolution-data-server-2.23.2-libebackend-breakage.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -126,6 +129,7 @@ This package contains developer documentation for %{name}.
 %patch11 -p1 -b .fix-ldap-query
 %patch12 -p1 -b .camel-folder-summary-crash
 %patch13 -p1 -b .fix-64bit-acinclude
+%patch14 -p1 -b .libebackend-breakage
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -372,6 +376,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Tue May 13 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.2-2.fc10
+- Fix some third-party package breakage caused by libebackend.
+
 * Mon May 12 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.2-1.fc10
 - Update to 2.23.2
 - Add files for new libebackend library.