diff --git a/0001-Cannot-create-appointments-regression-from-bug-70292.patch b/0001-Cannot-create-appointments-regression-from-bug-70292.patch new file mode 100644 index 0000000..d4b21f3 --- /dev/null +++ b/0001-Cannot-create-appointments-regression-from-bug-70292.patch @@ -0,0 +1,45 @@ +From e31cb5c9e9392db00c48aa883c2f54a3b48eaea1 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Fri, 16 Aug 2013 11:41:26 +0200 +Subject: [PATCH] Cannot create appointments (regression from bug #702922) + +(cherry picked from commit 286ab97d76d02a6c6a77ad919dc9d87703536d4b) +--- + src/calendar/e-cal-backend-ews-utils.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c +index a326391..36116cc 100644 +--- a/src/calendar/e-cal-backend-ews-utils.c ++++ b/src/calendar/e-cal-backend-ews-utils.c +@@ -65,8 +65,16 @@ e_ews_collect_attendees (icalcomponent *comp, + prop = icalcomponent_get_next_property (comp, ICAL_ATTENDEE_PROPERTY)) { + + str = icalproperty_get_attendee (prop); ++ ++ if (!str || !*str) ++ continue; ++ + /* figure the email address of the attendee, discard "mailto:" if it's there */ +- if (!g_ascii_strncasecmp (str, "mailto:", 7)) str = (str) + 7; ++ if (!g_ascii_strncasecmp (str, "mailto:", 7)) ++ str = (str) + 7; ++ ++ if (!*str) ++ continue; + + /* if this attenddee is the orgenizer - dont add him/her + in some cases there is no maito for email if meeting orginazer */ +@@ -756,6 +764,9 @@ e_ews_collect_organizer (icalcomponent *comp) + else + org_email_address = org; + ++ if (org_email_address && !*org_email_address) ++ org_email_address = NULL; ++ + return org_email_address; + } + +-- +1.8.3.1 + diff --git a/evolution-ews.spec b/evolution-ews.spec index 7558507..2d202e7 100644 --- a/evolution-ews.spec +++ b/evolution-ews.spec @@ -4,14 +4,14 @@ Name: evolution-ews Version: 3.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Evolution extension for Exchange Web Services License: LGPLv2 URL: http://projects.gnome.org/evolution Source: http://download.gnome.org/sources/%{name}/3.8/%{name}-%{version}.tar.xz -#Patch01: evolution-ews-3.5.90-xmlbuffer.patch +Patch01: 0001-Cannot-create-appointments-regression-from-bug-70292.patch Requires: evolution >= %{version} Requires: evolution-data-server >= %{version} @@ -27,7 +27,7 @@ versions 2007 and later, through its Exchange Web Services (EWS) interface. %prep %setup -q -#%patch01 -p1 -b .xmlbuffer +%patch01 -p1 %build %configure @@ -65,6 +65,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc %{_datadir}/evolution/%{evo_base_version}/errors/module-ews-configuration.error %changelog +* Fri Aug 16 2013 David Woodhouse - 3.8.5-2 +- Merge regression fix for BGO #702922 + * Sun Aug 11 2013 Matthew Barnes - 3.8.5-1 - Update to 3.8.5