From 61199cf63589011bdc153640d157df7172aa9dcc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 14 Aug 2009 21:55:02 +0000 Subject: [PATCH] - Add patch for GNOME bug #591414 (calendar library linked as module). --- ...-2.27.90-fix-libevolution-cal-shared.patch | 24 +++++++++++++++++++ evolution.spec | 10 +++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 evolution-2.27.90-fix-libevolution-cal-shared.patch diff --git a/evolution-2.27.90-fix-libevolution-cal-shared.patch b/evolution-2.27.90-fix-libevolution-cal-shared.patch new file mode 100644 index 0000000..f0f1156 --- /dev/null +++ b/evolution-2.27.90-fix-libevolution-cal-shared.patch @@ -0,0 +1,24 @@ +diff -up evolution-2.27.90/calendar/gui/Makefile.am.fix-libevolution-cal-shared evolution-2.27.90/calendar/gui/Makefile.am +--- evolution-2.27.90/calendar/gui/Makefile.am.fix-libevolution-cal-shared 2009-08-14 17:47:01.000000000 -0400 ++++ evolution-2.27.90/calendar/gui/Makefile.am 2009-08-14 17:47:14.000000000 -0400 +@@ -279,7 +279,7 @@ libevolution_cal_shared_la_LIBADD = + $(CAMEL_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) + +-libevolution_cal_shared_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) ++libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED) + + + libevolution_calendar_la_LIBADD = \ +diff -up evolution-2.27.90/calendar/gui/Makefile.in.fix-libevolution-cal-shared evolution-2.27.90/calendar/gui/Makefile.in +--- evolution-2.27.90/calendar/gui/Makefile.in.fix-libevolution-cal-shared 2009-08-14 17:47:21.000000000 -0400 ++++ evolution-2.27.90/calendar/gui/Makefile.in 2009-08-14 17:47:34.000000000 -0400 +@@ -730,7 +730,7 @@ libevolution_cal_shared_la_LIBADD = \ + $(CAMEL_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) + +-libevolution_cal_shared_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) ++libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED) + libevolution_calendar_la_LIBADD = \ + $(top_builddir)/calendar/gui/libevolution-cal-shared.la \ + $(WIN32_BOOTSTRAP_LIBS) \ diff --git a/evolution.spec b/evolution.spec index 26279b5..4dc47fb 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.27.90 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -66,6 +66,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +# GNOME bug #591414 +Patch13: evolution-2.27.90-fix-libevolution-cal-shared.patch + ## Dependencies ### Requires(post): GConf2 @@ -240,6 +243,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .fix-libevolution-cal-shared mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -479,6 +483,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libevolution-a11y.so.* %{_libdir}/evolution/%{evo_major}/libevolution-addressbook-a11y.so.* %{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-cal-shared.so.* %{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so.* %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so.* %{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.* @@ -695,6 +700,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Aug 14 2009 Matthew Barnes - 2.27.90-3.fc12 +- Add patch for GNOME bug #591414 (calendar library linked as module). + * Tue Aug 11 2009 Milan Crha - 2.27.90-2.fc12 - Build requires gnome-desktop-devel >= 2.26 - New library libevolution-cal-shared.so