From ea751f2d6d34a4b04591da35ec4f6954a200d756 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 13 Jul 2009 14:32:47 +0000 Subject: [PATCH] - Update to 2.27.4 --- .cvsignore | 2 +- evolution-2.27.3-anjal-support.patch | 37 ---------------------------- evolution.spec | 13 +++++----- sources | 2 +- 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 evolution-2.27.3-anjal-support.patch diff --git a/.cvsignore b/.cvsignore index a092b61..fa9c346 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.3.tar.bz2 +evolution-2.27.4.tar.bz2 diff --git a/evolution-2.27.3-anjal-support.patch b/evolution-2.27.3-anjal-support.patch deleted file mode 100644 index 442ec16..0000000 --- a/evolution-2.27.3-anjal-support.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up evolution-2.27.3/mail/e-mail-attachment-bar.h.anjal-support evolution-2.27.3/mail/e-mail-attachment-bar.h ---- evolution-2.27.3/mail/e-mail-attachment-bar.h.anjal-support 2009-06-12 10:54:40.000000000 -0400 -+++ evolution-2.27.3/mail/e-mail-attachment-bar.h 2009-06-23 10:37:33.000000000 -0400 -@@ -23,7 +23,7 @@ - #define E_MAIL_ATTACHMENT_BAR_H - - #include --#include -+#include - - /* Standard GObject macros */ - #define E_TYPE_MAIL_ATTACHMENT_BAR \ -diff -up evolution-2.27.3/mail/Makefile.am.anjal-support evolution-2.27.3/mail/Makefile.am ---- evolution-2.27.3/mail/Makefile.am.anjal-support 2009-06-12 10:54:40.000000000 -0400 -+++ evolution-2.27.3/mail/Makefile.am 2009-06-23 10:37:33.000000000 -0400 -@@ -105,10 +105,6 @@ mailinclude_HEADERS = \ - libevolution_mail_la_SOURCES = \ - $(MAIL_IDL_GENERATED) \ - $(mailinclude_HEADERS) \ -- e-attachment-handler-mail.c \ -- e-attachment-handler-mail.h \ -- e-mail-attachment-bar.c \ -- e-mail-search-bar.c \ - e-searching-tokenizer.c \ - em-account-prefs.c \ - em-account-prefs.h \ -@@ -174,6 +170,10 @@ libevolution_mail_la_DEPENDENCIES = \ - libevolution-mail-shared.la - - libevolution_mail_shared_la_SOURCES = \ -+ e-attachment-handler-mail.c \ -+ e-attachment-handler-mail.h \ -+ e-mail-attachment-bar.c \ -+ e-mail-search-bar.c \ - em-account-editor.c \ - em-account-editor.h \ - em-event.c \ diff --git a/evolution.spec b/evolution.spec index fd3bef6..bc0e921 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,8 +42,8 @@ ### Abstract ### Name: evolution -Version: 2.27.3 -Release: 5%{?dist} +Version: 2.27.4 +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 -# Support for building Anjal. -Patch13: evolution-2.27.3-anjal-support.patch - # Let the pst-import plugin work with current libpst. Patch14: evolution-2.27.3-pst-import.patch @@ -245,7 +242,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 .anjal-support %patch14 -p1 -b .pst-import mkdir -p krb5-fakeprefix/include @@ -701,7 +697,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Fri Jul 10 2009 Matthew Barnes - 2.26.3-2.fc11 +* Mon Jul 13 2009 Matthew Barnes - 2.27.4-1.fc12 +- Update to 2.27.4 + +* Fri Jul 10 2009 Matthew Barnes - 2.27.3-5.fc11 - Add an evolution-pst subpackage for the PST importer plugin. - Disabled until libpst settles on an API. diff --git a/sources b/sources index 03f347e..99b80da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31d95df4c3a8f078443ec22a57742aea evolution-2.27.3.tar.bz2 +4fc469d16b3fe8eefbb313f83f7a3f74 evolution-2.27.4.tar.bz2