[evolution-data-server/f16] Add patch for Red Hat bug #785183
Milan Crha
mcrha at fedoraproject.org
Tue Jan 31 08:06:35 UTC 2012
commit 07e4f55a6a997ccce6d0638f472f5084e4a8bb8f
Author: Milan Crha <mcrha at redhat.com>
Date: Tue Jan 31 09:06:13 2012 +0100
Add patch for Red Hat bug #785183
...on-data-server-3.2.3-libical-quote-escape.patch | 35 ++++++++++++++++++++
evolution-data-server.spec | 10 +++++-
2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/evolution-data-server-3.2.3-libical-quote-escape.patch b/evolution-data-server-3.2.3-libical-quote-escape.patch
new file mode 100644
index 0000000..47a7ed8
--- /dev/null
+++ b/evolution-data-server-3.2.3-libical-quote-escape.patch
@@ -0,0 +1,35 @@
+commit 830fa86226aa2c4fd0687aef605c93920888e3c4
+Author: Milan Crha <mcrha at redhat.com>
+Date: Mon Jan 30 19:25:41 2012 +0100
+
+ Bug #669003 - CalDAV: Cannot modify calendar object (libical 0.48)
+
+diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
+index 694e64a..50cece5 100644
+--- a/calendar/backends/caldav/e-cal-backend-caldav.c
++++ b/calendar/backends/caldav/e-cal-backend-caldav.c
+@@ -422,6 +422,24 @@ ecalcomp_get_etag (ECalComponent *comp)
+
+ str = icomp_x_prop_get (icomp, X_E_CALDAV "ETAG");
+
++ /* libical 0.48 escapes quotes, thus unescape them */
++ if (str && strchr (str, '\\')) {
++ gint ii, jj;
++
++ for (ii = 0, jj = 0; str[ii]; ii++) {
++ if (str[ii] == '\\') {
++ ii++;
++ if (!str[ii])
++ break;
++ }
++
++ str[jj] = str[ii];
++ jj++;
++ }
++
++ str[jj] = 0;
++ }
++
+ return str;
+ }
+
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 7019595..82c71f6 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -25,7 +25,7 @@
Name: evolution-data-server
Version: 3.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Libraries
Summary: Backend data server for Evolution
License: LGPLv2+
@@ -41,6 +41,9 @@ Obsoletes: evolution-webcal < 2.24.0
# RH bug #243296
Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
+# RH bug #785183
+Patch12: evolution-data-server-3.2.3-libical-quote-escape.patch
+
### Build Dependencies ###
BuildRequires: GConf2-devel
@@ -120,6 +123,7 @@ This package contains developer documentation for %{name}.
%setup -q
%patch11 -p1 -b .fix-64bit-acinclude
+%patch12 -p1 -b .libical-quote-escape
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -343,6 +347,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/libedataserverui
%changelog
+* Tue Jan 31 2012 Milan Crha <mcrha at redhat.com> - 3.2.3-2
+- Add patch for Red Hat bug #785183 (Google Calendar: Cannot
+ modify calendar object)
+
* Mon Jan 09 2012 Milan Crha <mcrha at redhat.com> - 3.2.3-1
- Update to 3.2.3
- Remove patch for GNOME bug #665253 (fixed upstream).
More information about the scm-commits
mailing list