From f62fad63de5e09664385803e78d85643cb3783a7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 3 Nov 2008 18:42:41 +0000 Subject: [PATCH 01/13] Initialize branch F-10 for evolution --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 5513115860bccad6ed434870a25f1669c836c2d8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 7 Nov 2008 13:47:00 +0000 Subject: [PATCH 02/13] - Update to 2.24.1.1 --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index c1c64de..432d5e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.24.1.tar.bz2 +evolution-2.24.1.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index fd87bc0..4a7fec6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.24.1 -Release: 2%{?dist} +Version: 2.24.1.1 +Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* 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..3ea9197 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d770bfddf8a79b841c515f756cb5af4b evolution-2.24.1.tar.bz2 +3a76f0e2493e7497ac8526c31a2bc7a3 evolution-2.24.1.1.tar.bz2 From 1adbb952347db55a959f99361a93a9952a5096eb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 20 Nov 2008 15:11:27 +0000 Subject: [PATCH 03/13] - Fix a typo (RH bug #472358). --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 4a7fec6..205cfcc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.24.1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -188,7 +188,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} @@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* 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 From 82994068ca887be398bd43c2c2058d77b2dcb183 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 24 Nov 2008 15:07:31 +0000 Subject: [PATCH 04/13] - Update to 2.24.2 --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 432d5e1..1bfd28d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.24.1.1.tar.bz2 +evolution-2.24.2.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 205cfcc..96a7ebe 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.24.1.1 -Release: 2%{?dist} +Version: 2.24.2 +Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* 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). diff --git a/sources b/sources index 3ea9197..aba3501 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a76f0e2493e7497ac8526c31a2bc7a3 evolution-2.24.1.1.tar.bz2 +2b6621e8b71b06db57b776f66798f3b4 evolution-2.24.2.tar.bz2 From d13e34426cbf37a0db1283e7a03fdec6758dd7fb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 9 Dec 2008 17:30:21 +0000 Subject: [PATCH 05/13] - Add patch for GNOME bug #552583 (fix account URI comparisons). --- evolution-2.24.2-broken-account-uris.patch | 155 +++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 evolution-2.24.2-broken-account-uris.patch diff --git a/evolution-2.24.2-broken-account-uris.patch b/evolution-2.24.2-broken-account-uris.patch new file mode 100644 index 0000000..9f39065 --- /dev/null +++ b/evolution-2.24.2-broken-account-uris.patch @@ -0,0 +1,155 @@ +diff -up evolution-2.24.2/mail/mail-config.c.broken-account-uris evolution-2.24.2/mail/mail-config.c +--- evolution-2.24.2/mail/mail-config.c.broken-account-uris 2008-11-19 23:07:24.000000000 -0500 ++++ evolution-2.24.2/mail/mail-config.c 2008-12-09 11:27:34.000000000 -0500 +@@ -778,53 +778,64 @@ mail_config_get_account_by_uid (const ch + return (EAccount *) e_account_list_find (config->accounts, E_ACCOUNT_FIND_UID, uid); + } + ++static gboolean ++mail_config_account_url_equal (const CamelURL *u1, ++ const CamelURL *u2) ++{ ++ /* For the purpose of matching a URL to an EAccount, only compare ++ * the protocol, user, host and port and disregard the rest. */ ++ ++ if (g_strcmp0 (u1->protocol, u2->protocol) != 0) ++ return FALSE; ++ ++ if (g_strcmp0 (u1->user, u2->user) != 0) ++ return FALSE; ++ ++ if (g_strcmp0 (u1->host, u2->host) != 0) ++ return FALSE; ++ ++ return (u1->port == u2->port); ++} ++ + EAccount * + mail_config_get_account_by_source_url (const char *source_url) + { + EAccount *account = NULL; + EIterator *iter; ++ CamelURL *url; + + g_return_val_if_fail (source_url != NULL, NULL); + ++ url = camel_url_new (source_url, NULL); ++ g_return_val_if_fail (url != NULL, NULL); ++ + iter = e_list_get_iterator ((EList *) config->accounts); +- while (e_iterator_is_valid (iter)) { +- CamelURL *url; +- gchar *string; ++ while (account == NULL && e_iterator_is_valid (iter)) { ++ CamelURL *account_url; + + account = (EAccount *) e_iterator_get (iter); + + e_iterator_next (iter); + +- if (account->source == NULL) +- continue; +- +- else if (account->source->url == NULL) +- continue; +- +- else if (*account->source->url == '\0') ++ if ( !account || (account->source == NULL) || ++ (account->source->url == NULL) || (*account->source->url == '\0')) { ++ account = NULL; + continue; ++ } + +- url = camel_url_new (account->source->url, NULL); +- if (url == NULL) ++ account_url = camel_url_new (account->source->url, NULL); ++ if (account_url == NULL) + continue; + +- /* Simplify the account URL for comparison. */ +- string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); +- if (string == NULL || strcmp (string, source_url) != 0) ++ if (!mail_config_account_url_equal (url, account_url)) + account = NULL; /* not a match */ + +- camel_url_free (url); +- g_free (string); +- +- if (account != NULL) { +- g_object_unref (iter); +- return account; +- } ++ camel_url_free (account_url); + } + + g_object_unref (iter); + +- return NULL; ++ return account; + } + + EAccount * +@@ -832,48 +843,40 @@ mail_config_get_account_by_transport_url + { + EAccount *account = NULL; + EIterator *iter; ++ CamelURL *url; + + g_return_val_if_fail (transport_url != NULL, NULL); + ++ url = camel_url_new (transport_url, NULL); ++ g_return_val_if_fail (url != NULL, NULL); ++ + iter = e_list_get_iterator ((EList *) config->accounts); +- while (e_iterator_is_valid (iter)) { +- CamelURL *url; +- gchar *string; ++ while (account == NULL && e_iterator_is_valid (iter)) { ++ CamelURL *account_url; + + account = (EAccount *) e_iterator_get (iter); + + e_iterator_next (iter); + +- if (account->transport == NULL) +- continue; +- +- else if (account->transport->url == NULL) +- continue; +- +- else if (*account->transport->url == '\0') +- continue; ++ if ( !account || (account->transport == NULL) || ++ (account->transport->url == NULL) || (*account->transport->url == '\0')) { ++ account = NULL; ++ continue; ++ } + +- url = camel_url_new (account->transport->url, NULL); +- if (url == NULL) ++ account_url = camel_url_new (account->transport->url, NULL); ++ if (account_url == NULL) + continue; + +- /* Simplify the account URL for comparison. */ +- string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); +- if (string == NULL || strcmp (string, transport_url) != 0) ++ if (!mail_config_account_url_equal (url, account_url)) + account = NULL; /* not a match */ + + camel_url_free (url); +- g_free (string); +- +- if (account != NULL) { +- g_object_unref (iter); +- return account; +- } + } + + g_object_unref (iter); + +- return NULL; ++ return account; + } + + int diff --git a/evolution.spec b/evolution.spec index 96a7ebe..7d1866a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.24.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -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 +# GNOME bug #552583 +Patch16: evolution-2.24.2-broken-account-uris.patch + ## Dependencies ### Requires(post): GConf2 @@ -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 .broken-account-uris mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -696,6 +700,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* 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 From a46b6698765bca6dc90cd903ad90439e13cfca9f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 14 Dec 2008 19:13:41 +0000 Subject: [PATCH 06/13] - Add patch for RH bug #476438 (bogus spamassassin errors). --- evolution-2.24.2-sa-junk-plugin.patch | 12 ++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 evolution-2.24.2-sa-junk-plugin.patch diff --git a/evolution-2.24.2-sa-junk-plugin.patch b/evolution-2.24.2-sa-junk-plugin.patch new file mode 100644 index 0000000..4f3fa35 --- /dev/null +++ b/evolution-2.24.2-sa-junk-plugin.patch @@ -0,0 +1,12 @@ +diff -up evolution-2.24.2/plugins/sa-junk-plugin/em-junk-filter.c.sa-junk-plugin evolution-2.24.2/plugins/sa-junk-plugin/em-junk-filter.c +--- evolution-2.24.2/plugins/sa-junk-plugin/em-junk-filter.c.sa-junk-plugin 2008-10-13 04:37:00.000000000 -0400 ++++ evolution-2.24.2/plugins/sa-junk-plugin/em-junk-filter.c 2008-12-14 14:11:08.000000000 -0500 +@@ -250,7 +250,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, + else + res = rv_err; + +- if (res != 0) ++ if (res >= 64) + g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to SpamAssassin failed, error code: %d"), res); + + return res; diff --git a/evolution.spec b/evolution.spec index 7d1866a..8054496 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.24.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -83,6 +83,9 @@ Patch15: evolution-2.23.4-experimental-plugins.patch # GNOME bug #552583 Patch16: evolution-2.24.2-broken-account-uris.patch +# RH bug #476438 / GNOME bug #560420 +Patch17: evolution-2.24.2-sa-junk-plugin.patch + ## Dependencies ### Requires(post): GConf2 @@ -236,6 +239,7 @@ This package contains supplemental utilities for %{name} that require Perl. %patch14 -p1 -b .im-context-reset %patch15 -p1 -b .experimental-plugins %patch16 -p1 -b .broken-account-uris +%patch17 -p1 -b .sa-junk-plugin mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -700,6 +704,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* 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). From 0f94c4f072ed3946b7ac72d53265bab9cbb53841 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 Jan 2009 19:49:08 +0000 Subject: [PATCH 07/13] - Update to 2.24.3 - Remove patch for RH bug #476438 (fixed upstream). - Remove patch for GNOME bug #552583 (fixed upstream). --- .cvsignore | 2 +- evolution-2.24.2-broken-account-uris.patch | 155 --------------------- evolution-2.24.2-sa-junk-plugin.patch | 12 -- evolution.spec | 17 +-- sources | 2 +- 5 files changed, 9 insertions(+), 179 deletions(-) delete mode 100644 evolution-2.24.2-broken-account-uris.patch delete mode 100644 evolution-2.24.2-sa-junk-plugin.patch diff --git a/.cvsignore b/.cvsignore index 1bfd28d..48c1145 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.24.2.tar.bz2 +evolution-2.24.3.tar.bz2 diff --git a/evolution-2.24.2-broken-account-uris.patch b/evolution-2.24.2-broken-account-uris.patch deleted file mode 100644 index 9f39065..0000000 --- a/evolution-2.24.2-broken-account-uris.patch +++ /dev/null @@ -1,155 +0,0 @@ -diff -up evolution-2.24.2/mail/mail-config.c.broken-account-uris evolution-2.24.2/mail/mail-config.c ---- evolution-2.24.2/mail/mail-config.c.broken-account-uris 2008-11-19 23:07:24.000000000 -0500 -+++ evolution-2.24.2/mail/mail-config.c 2008-12-09 11:27:34.000000000 -0500 -@@ -778,53 +778,64 @@ mail_config_get_account_by_uid (const ch - return (EAccount *) e_account_list_find (config->accounts, E_ACCOUNT_FIND_UID, uid); - } - -+static gboolean -+mail_config_account_url_equal (const CamelURL *u1, -+ const CamelURL *u2) -+{ -+ /* For the purpose of matching a URL to an EAccount, only compare -+ * the protocol, user, host and port and disregard the rest. */ -+ -+ if (g_strcmp0 (u1->protocol, u2->protocol) != 0) -+ return FALSE; -+ -+ if (g_strcmp0 (u1->user, u2->user) != 0) -+ return FALSE; -+ -+ if (g_strcmp0 (u1->host, u2->host) != 0) -+ return FALSE; -+ -+ return (u1->port == u2->port); -+} -+ - EAccount * - mail_config_get_account_by_source_url (const char *source_url) - { - EAccount *account = NULL; - EIterator *iter; -+ CamelURL *url; - - g_return_val_if_fail (source_url != NULL, NULL); - -+ url = camel_url_new (source_url, NULL); -+ g_return_val_if_fail (url != NULL, NULL); -+ - iter = e_list_get_iterator ((EList *) config->accounts); -- while (e_iterator_is_valid (iter)) { -- CamelURL *url; -- gchar *string; -+ while (account == NULL && e_iterator_is_valid (iter)) { -+ CamelURL *account_url; - - account = (EAccount *) e_iterator_get (iter); - - e_iterator_next (iter); - -- if (account->source == NULL) -- continue; -- -- else if (account->source->url == NULL) -- continue; -- -- else if (*account->source->url == '\0') -+ if ( !account || (account->source == NULL) || -+ (account->source->url == NULL) || (*account->source->url == '\0')) { -+ account = NULL; - continue; -+ } - -- url = camel_url_new (account->source->url, NULL); -- if (url == NULL) -+ account_url = camel_url_new (account->source->url, NULL); -+ if (account_url == NULL) - continue; - -- /* Simplify the account URL for comparison. */ -- string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); -- if (string == NULL || strcmp (string, source_url) != 0) -+ if (!mail_config_account_url_equal (url, account_url)) - account = NULL; /* not a match */ - -- camel_url_free (url); -- g_free (string); -- -- if (account != NULL) { -- g_object_unref (iter); -- return account; -- } -+ camel_url_free (account_url); - } - - g_object_unref (iter); - -- return NULL; -+ return account; - } - - EAccount * -@@ -832,48 +843,40 @@ mail_config_get_account_by_transport_url - { - EAccount *account = NULL; - EIterator *iter; -+ CamelURL *url; - - g_return_val_if_fail (transport_url != NULL, NULL); - -+ url = camel_url_new (transport_url, NULL); -+ g_return_val_if_fail (url != NULL, NULL); -+ - iter = e_list_get_iterator ((EList *) config->accounts); -- while (e_iterator_is_valid (iter)) { -- CamelURL *url; -- gchar *string; -+ while (account == NULL && e_iterator_is_valid (iter)) { -+ CamelURL *account_url; - - account = (EAccount *) e_iterator_get (iter); - - e_iterator_next (iter); - -- if (account->transport == NULL) -- continue; -- -- else if (account->transport->url == NULL) -- continue; -- -- else if (*account->transport->url == '\0') -- continue; -+ if ( !account || (account->transport == NULL) || -+ (account->transport->url == NULL) || (*account->transport->url == '\0')) { -+ account = NULL; -+ continue; -+ } - -- url = camel_url_new (account->transport->url, NULL); -- if (url == NULL) -+ account_url = camel_url_new (account->transport->url, NULL); -+ if (account_url == NULL) - continue; - -- /* Simplify the account URL for comparison. */ -- string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); -- if (string == NULL || strcmp (string, transport_url) != 0) -+ if (!mail_config_account_url_equal (url, account_url)) - account = NULL; /* not a match */ - - camel_url_free (url); -- g_free (string); -- -- if (account != NULL) { -- g_object_unref (iter); -- return account; -- } - } - - g_object_unref (iter); - -- return NULL; -+ return account; - } - - int diff --git a/evolution-2.24.2-sa-junk-plugin.patch b/evolution-2.24.2-sa-junk-plugin.patch deleted file mode 100644 index 4f3fa35..0000000 --- a/evolution-2.24.2-sa-junk-plugin.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up evolution-2.24.2/plugins/sa-junk-plugin/em-junk-filter.c.sa-junk-plugin evolution-2.24.2/plugins/sa-junk-plugin/em-junk-filter.c ---- evolution-2.24.2/plugins/sa-junk-plugin/em-junk-filter.c.sa-junk-plugin 2008-10-13 04:37:00.000000000 -0400 -+++ evolution-2.24.2/plugins/sa-junk-plugin/em-junk-filter.c 2008-12-14 14:11:08.000000000 -0500 -@@ -250,7 +250,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, - else - res = rv_err; - -- if (res != 0) -+ if (res >= 64) - g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to SpamAssassin failed, error code: %d"), res); - - return res; diff --git a/evolution.spec b/evolution.spec index 8054496..34b08dc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.24.2 -Release: 3%{?dist} +Version: 2.24.3 +Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -80,12 +80,6 @@ Patch14: evolution-2.9.1-im-context-reset.patch # Don't ship broken plugins as stable Patch15: evolution-2.23.4-experimental-plugins.patch -# GNOME bug #552583 -Patch16: evolution-2.24.2-broken-account-uris.patch - -# RH bug #476438 / GNOME bug #560420 -Patch17: evolution-2.24.2-sa-junk-plugin.patch - ## Dependencies ### Requires(post): GConf2 @@ -238,8 +232,6 @@ 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 .broken-account-uris -%patch17 -p1 -b .sa-junk-plugin mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -704,6 +696,11 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Jan 12 2009 Matthew Barnes - 2.24.3-1.fc10 +- Update 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). diff --git a/sources b/sources index aba3501..a75c7c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b6621e8b71b06db57b776f66798f3b4 evolution-2.24.2.tar.bz2 +6671b2d31ea77ba6190fadbc51186567 evolution-2.24.3.tar.bz2 From 5da2c72f2af995a751a0f234c1349be018876c62 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 Jan 2009 20:23:54 +0000 Subject: [PATCH 08/13] - 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). --- evolution.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 34b08dc..f734931 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 @@ -698,6 +698,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * 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). From 1d55e3a2499181ff6ce90e8de55ad59950d51899 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 30 Jan 2009 21:28:57 +0000 Subject: [PATCH 09/13] - Update to 2.24.4 --- .cvsignore | 2 +- evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 48c1145..8e77f24 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.24.3.tar.bz2 +evolution-2.24.4.tar.bz2 diff --git a/evolution.spec b/evolution.spec index f734931..098cce1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.24.3 +Version: 2.24.4 Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity @@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* 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. diff --git a/sources b/sources index a75c7c4..4d15acf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6671b2d31ea77ba6190fadbc51186567 evolution-2.24.3.tar.bz2 +2d4cb1a65223b141e974b51452feae03 evolution-2.24.4.tar.bz2 From fdb30beb44de8fe3f457f8c059850490506084f4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 25 Feb 2009 15:56:15 +0000 Subject: [PATCH 10/13] - Update to 2.24.5 --- .cvsignore | 2 +- evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8e77f24..61e8f96 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.24.4.tar.bz2 +evolution-2.24.5.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 098cce1..955167b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.24.4 +Version: 2.24.5 Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity @@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* 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 diff --git a/sources b/sources index 4d15acf..7b277c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d4cb1a65223b141e974b51452feae03 evolution-2.24.4.tar.bz2 +a8fe850565aef43b9e99f73aa02a9d3e evolution-2.24.5.tar.bz2 From 5a484aabbef736fd4e1883ea0a7cdd60a30d5686 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 1 Jun 2009 13:00:51 +0000 Subject: [PATCH 11/13] - Add patch for RH bug #503445 (no username in Google calendar setup). --- evolution-2.24.5-google-account-setup.patch | 26 +++++++++++++++++++++ evolution.spec | 9 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 evolution-2.24.5-google-account-setup.patch 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 955167b..42b811d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.24.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -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 @@ -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,9 @@ 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 From 022d7874df93aace34f106ea07c7e627c3e4d1b4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:58 +0000 Subject: [PATCH 12/13] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dd23cb0..c22b7db 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: evolution -# $Id: Makefile,v 1.1 2004/09/09 04:34:33 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:44:15 notting 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 357723ac33dc2ad19bda2004cfdec2d8f6619f80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 14:01:18 +0000 Subject: [PATCH 13/13] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c22b7db..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: evolution -# $Id: Makefile,v 1.2 2007/10/15 18:44:15 notting 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 $$d/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/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10