[evolution-data-server/f14/master] Don't link libebook to GTK+.
Matthew Barnes
mbarnes at fedoraproject.org
Fri Oct 1 12:25:58 UTC 2010
commit 584b946ce4015271ccde704594cb505e151c6ba6
Author: Matthew Barnes <mbarnes at redhat.com>
Date: Fri Oct 1 08:25:43 2010 -0400
Don't link libebook to GTK+.
...a-server-2.32.0-dont-link-libebook-to-gtk.patch | 21 ++++++++++++++++++++
evolution-data-server.spec | 9 +++++++-
2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/evolution-data-server-2.32.0-dont-link-libebook-to-gtk.patch b/evolution-data-server-2.32.0-dont-link-libebook-to-gtk.patch
new file mode 100644
index 0000000..872389e
--- /dev/null
+++ b/evolution-data-server-2.32.0-dont-link-libebook-to-gtk.patch
@@ -0,0 +1,21 @@
+diff -up evolution-data-server-2.32.0/addressbook/libegdbus/Makefile.am.dont-link-libebook-to-gtk evolution-data-server-2.32.0/addressbook/libegdbus/Makefile.am
+--- evolution-data-server-2.32.0/addressbook/libegdbus/Makefile.am.dont-link-libebook-to-gtk 2010-09-13 08:16:52.000000000 -0400
++++ evolution-data-server-2.32.0/addressbook/libegdbus/Makefile.am 2010-10-01 08:22:13.391227366 -0400
+@@ -15,7 +15,7 @@ libegdbus_book_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DG_LOG_DOMAIN=\"libegdbus-book\" \
+ -I$(top_srcdir)/addressbook \
+- $(GNOME_PLATFORM_CFLAGS)
++ $(E_DATA_SERVER_CFLAGS)
+
+ libegdbus_book_la_SOURCES = \
+ e-gdbus-egdbusbook.h \
+@@ -29,7 +29,7 @@ libegdbus_book_la_SOURCES = \
+ e-gdbus-typemappers.h
+
+ libegdbus_book_la_LIBADD = \
+- $(GNOME_PLATFORM_LIBS)
++ $(E_DATA_SERVER_LIBS)
+
+ libegdbus_book_la_LDFLAGS = $(NO_UNDEFINED)
+
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index dcae7f9..0650e89 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -25,7 +25,7 @@
Name: evolution-data-server
Version: 2.32.0
-Release: 1%{?dist}.1
+Release: 2%{?dist}
Group: System Environment/Libraries
Summary: Backend data server for Evolution
License: LGPLv2+
@@ -41,6 +41,9 @@ Obsoletes: evolution-webcal < 2.24.0
# RH bug #243296
Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
+# libebook accidentally got linked to GTK+
+Patch12: evolution-data-server-2.32.0-dont-link-libebook-to-gtk.patch
+
### Build Dependencies ###
BuildRequires: GConf2-devel
@@ -118,6 +121,7 @@ This package contains developer documentation for %{name}.
%setup -q
%patch11 -p1 -b .fix-64bit-acinclude
+%patch12 -p1 -b .dont-link-libebook-to-gtk
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -332,6 +336,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/libedataserverui
%changelog
+* Fri Oct 01 2010 Matthew Barnes <mbarnes at redhat.com> - 2.32.0-2.fc14
+- Don't link libebook to GTK+.
+
* Wed Sep 29 2010 jkeating - 2.32.0-1.1
- Rebuilt for gcc bug 634757
More information about the scm-commits
mailing list