From 31c8908cc009842a4751e525d923a42b18d7e741 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 Aug 2009 11:07:27 +0000 Subject: [PATCH] - Update to 2.27.91 - Remove patch for GNOME bug #591414 (fixed upstream). --- .cvsignore | 2 +- ...-2.27.90-fix-libevolution-cal-shared.patch | 24 ------------------- evolution.spec | 14 +++++------ sources | 2 +- 4 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 evolution-2.27.90-fix-libevolution-cal-shared.patch diff --git a/.cvsignore b/.cvsignore index c3948bb..b3f2978 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.90.tar.bz2 +evolution-2.27.91.tar.bz2 diff --git a/evolution-2.27.90-fix-libevolution-cal-shared.patch b/evolution-2.27.90-fix-libevolution-cal-shared.patch deleted file mode 100644 index f0f1156..0000000 --- a/evolution-2.27.90-fix-libevolution-cal-shared.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 4dc47fb..169040b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -5,7 +5,7 @@ %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 %define gtk2_version 2.14.0 -%define gtkhtml_version 3.27.90 +%define gtkhtml_version 3.27.91 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonobo_version 2.20.3 @@ -42,8 +42,8 @@ ### Abstract ### Name: evolution -Version: 2.27.90 -Release: 3%{?dist} +Version: 2.27.91 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -66,9 +66,6 @@ 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 @@ -243,7 +240,6 @@ 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 @@ -700,6 +696,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 24 2009 Milan Crha - 2.27.91-1.fc12 +- Update to 2.27.91 +- Remove patch for GNOME bug #591414 (fixed upstream). + * Fri Aug 14 2009 Matthew Barnes - 2.27.90-3.fc12 - Add patch for GNOME bug #591414 (calendar library linked as module). diff --git a/sources b/sources index 85fc9ab..b7e07ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c42df966be237cf5043943af3e7faa8 evolution-2.27.90.tar.bz2 +4f28ce4302ec26ea1b3ecb93c920c07c evolution-2.27.91.tar.bz2