[folks] Fix for eds api change

Matthias Clasen mclasen at fedoraproject.org
Tue Jun 26 03:02:48 UTC 2012


commit b02c3395af12f015cf6add43f10f2f9b717fa620
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Jun 25 23:03:58 2012 -0400

    Fix for eds api change

 book-uid.patch |   12 ++++++++++++
 folks.spec     |   10 ++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/book-uid.patch b/book-uid.patch
new file mode 100644
index 0000000..374f539
--- /dev/null
+++ b/book-uid.patch
@@ -0,0 +1,12 @@
+diff -up folks-0.7.1/backends/eds/lib/edsf-persona-store.vala.uid folks-0.7.1/backends/eds/lib/edsf-persona-store.vala
+--- folks-0.7.1/backends/eds/lib/edsf-persona-store.vala.uid	2012-06-25 23:02:07.766454711 -0400
++++ folks-0.7.1/backends/eds/lib/edsf-persona-store.vala	2012-06-25 23:01:35.317455870 -0400
+@@ -1174,7 +1174,7 @@ public class Edsf.PersonaStore : Folks.P
+           /* Irrelevant */
+           case ContactField.UID: /* identifier */
+           case ContactField.REV: /* revision date */
+-          case ContactField.BOOK_URI: /* parent identifier */
++          case ContactField.BOOK_UID: /* parent identifier */
+           case ContactField.NAME_OR_ORG: /* FULL_NAME or ORG; both handled */
+             return PersonaDetail.INVALID;
+           /* Unsupported */
diff --git a/folks.spec b/folks.spec
index 12544ab..451a04d 100644
--- a/folks.spec
+++ b/folks.spec
@@ -4,7 +4,7 @@
 Name:           folks
 Epoch:          1
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GObject contact aggregation library
 
 Group:          System Environment/Libraries
@@ -12,6 +12,9 @@ License:        LGPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/Folks
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.7/%{name}-%{version}.tar.xz
 
+# upstream fix
+Patch0:         book-uid.patch
+
 BuildRequires:  telepathy-glib-devel >= %{tp_glib_ver}
 BuildRequires:  telepathy-glib-vala
 BuildRequires:  libzeitgeist-devel >= %{zeitgeist_ver}
@@ -61,7 +64,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure --disable-static --enable-eds-backend --enable-vala --enable-inspect-tool --disable-libsocialweb-backend
@@ -99,6 +102,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Mon Jun 25 2012 Matthias Clasen <mclasen at redhat.com> - 1:0.7.1-2
+- Update for e-d-s api change
+
 * Mon Jun 18 2012 Brian Pepple <bpepple at fedoraproject.org> - 1:0.7.1-1
 - Update to 0.7.1.
 - Bump version of eds and tp-glib needed.


More information about the scm-commits mailing list