diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index c1c64de..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -evolution-2.24.1.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..61e8f96 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +evolution-2.24.5.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index dd23cb0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: evolution -# $Id: Makefile,v 1.1 2004/09/09 04:34:33 cvsdist Exp $ -NAME := evolution -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/evolution-2.24.5-google-account-setup.patch b/evolution-2.24.5-google-account-setup.patch new file mode 100644 index 0000000..174b0e7 --- /dev/null +++ b/evolution-2.24.5-google-account-setup.patch @@ -0,0 +1,26 @@ +diff -U0 evolution-2.24.5/plugins/google-account-setup/ChangeLog.google-account-setup evolution-2.24.5/plugins/google-account-setup/ChangeLog +diff -up evolution-2.24.5/plugins/google-account-setup/google-contacts-source.c.google-account-setup evolution-2.24.5/plugins/google-account-setup/google-contacts-source.c +--- evolution-2.24.5/plugins/google-account-setup/google-contacts-source.c.google-account-setup 2009-02-25 06:55:23.000000000 -0500 ++++ evolution-2.24.5/plugins/google-account-setup/google-contacts-source.c 2009-06-01 08:38:03.000000000 -0400 +@@ -300,7 +300,7 @@ plugin_google_contacts (EPlugin + + g_object_set_data (G_OBJECT (epl), "gwidget", NULL); + +- if (strcmp (base_uri, "google://")) { ++ if (g_ascii_strncasecmp ("google://", base_uri, 9) != 0) { + return NULL; + } + +diff -up evolution-2.24.5/plugins/google-account-setup/google-source.c.google-account-setup evolution-2.24.5/plugins/google-account-setup/google-source.c +--- evolution-2.24.5/plugins/google-account-setup/google-source.c.google-account-setup 2009-01-29 07:41:23.000000000 -0500 ++++ evolution-2.24.5/plugins/google-account-setup/google-source.c 2009-06-01 08:38:03.000000000 -0400 +@@ -574,8 +574,7 @@ plugin_google (EPlugin + group = e_source_peek_group (source); + + widget = NULL; +- if (!g_str_has_prefix (e_source_group_peek_base_uri (group), +- "Google")) { ++ if (g_ascii_strncasecmp ("google://", e_source_group_peek_base_uri (group), 9) != 0) { + return NULL; + } + diff --git a/evolution.spec b/evolution.spec index fd87bc0..42b811d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.24.1 +%define eds_version 2.24.3 %define glib2_version 2.16.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.24.1 +Version: 2.24.5 Release: 2%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity @@ -80,6 +80,9 @@ Patch14: evolution-2.9.1-im-context-reset.patch # Don't ship broken plugins as stable Patch15: evolution-2.23.4-experimental-plugins.patch +# RH bug #503445 / GNOME bug #574248 +Patch16: evolution-2.24.5-google-account-setup.patch + ## Dependencies ### Requires(post): GConf2 @@ -188,7 +191,7 @@ This package contains user documentation for %{name}. %if %{build_conduits} %package conduits -Group: Applictions/Communications +Group: Applications/Communications Summary: gnome-pilot conduits for %{name} Requires: %{name} = %{version}-%{release} Requires: gnome-pilot >= %{gnome_pilot_version} @@ -232,6 +235,7 @@ This package contains supplemental utilities for %{name} that require Perl. %patch13 -p1 -b .no-gnome-common %patch14 -p1 -b .im-context-reset %patch15 -p1 -b .experimental-plugins +%patch16 -p1 -b .google-account-setup mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -696,6 +700,36 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Jun 01 2009 Matthew Barnes - 2.24.5-2.fc10 +- Add patch for RH bug #503445 (no username in Google calendar setup). + +* Wed Feb 25 2009 Matthew Barnes - 2.24.5-1.fc10 +- Update to 2.24.5 + +* Fri Jan 30 2009 Matthew Barnes - 2.24.4-1.fc10 +- Update to 2.24.4 + +* Mon Jan 12 2009 Matthew Barnes - 2.24.3-1.fc10 +- Update to 2.24.3 +- Bump eds_version to 2.24.3. +- Remove patch for RH bug #476438 (fixed upstream). +- Remove patch for GNOME bug #552583 (fixed upstream). + +* Sun Dec 14 2008 Matthew Barnes - 2.24.2-3.fc10 +- Add patch for RH bug #476438 (bogus spamassassin errors). + +* Tue Dec 09 2008 Matthew Barnes - 2.24.2-2.fc10 +- Add patch for GNOME bug #552583 (fix account URI comparisons). + +* Mon Nov 24 2008 Matthew Barnes - 2.24.2-1.fc10 +- Update to 2.24.2 + +* Thu Nov 20 2008 Matthew Barnes - 2.24.1.1-2.fc10 +- Fix a typo (RH bug #472358). + +* Fri Nov 07 2008 Matthew Barnes - 2.24.1.1-1.fc10 +- Update to 2.24.1.1 + * Tue Oct 21 2008 Matthew Barnes - 2.24.1-2.fc10 - Bump eds_version to 2.24.1 (unfortunately). diff --git a/sources b/sources index 6892bd0..7b277c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d770bfddf8a79b841c515f756cb5af4b evolution-2.24.1.tar.bz2 +a8fe850565aef43b9e99f73aa02a9d3e evolution-2.24.5.tar.bz2