From d317a70f7450b8dd637ec6779c098793055b2915 Mon Sep 17 00:00:00 2001
From: Brian Pepple <bpepple@fedoraproject.org>
Date: Jun 28 2012 22:17:12 +0000
Subject: Update to 0.7.2.1.


- Drop book-uid patch. Fixed upstream.
- Bump minimum version of eds needed.

---

diff --git a/.gitignore b/.gitignore
index cad79e2..3db3638 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ folks-0.6.7.tar.xz
 /folks-0.6.9.tar.xz
 /folks-0.7.0.tar.xz
 /folks-0.7.1.tar.xz
+/folks-0.7.2.tar.xz
+/folks-0.7.2.1.tar.xz
diff --git a/book-uid.patch b/book-uid.patch
deleted file mode 100644
index 374f539..0000000
--- a/book-uid.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 b92c655..c7b619d 100644
--- a/folks.spec
+++ b/folks.spec
@@ -3,8 +3,8 @@
 
 Name:           folks
 Epoch:          1
-Version:        0.7.1
-Release:        2%{?dist}
+Version:        0.7.2.1
+Release:        1%{?dist}
 Summary:        GObject contact aggregation library
 
 Group:          System Environment/Libraries
@@ -12,9 +12,6 @@ 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}
@@ -24,7 +21,7 @@ BuildRequires:  vala-tools
 BuildRequires:  libxml2-devel
 BuildRequires:  gobject-introspection >= 0.9.12
 BuildRequires:  GConf2-devel
-BuildRequires:  evolution-data-server-devel >= 3.5.3
+BuildRequires:  evolution-data-server-devel >= 3.5.4
 BuildRequires:  readline-devel
 ## BuildRequires: tracker-devel >= 0.10
 BuildRequires:  pkgconfig(gee-1.0)
@@ -64,7 +61,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
@@ -110,6 +107,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 %changelog
+* Thu Jun 28 2012 Brian Pepple <bpepple@fedoraproject.org> - 1:0.7.2.1-1
+- Update to 0.7.2.1.
+- Drop book-uid patch. Fixed upstream.
+- Bump minimum version of eds needed.
+
 * Mon Jun 25 2012 Matthias Clasen <mclasen@redhat.com> - 1:0.7.1-2
 - Update for e-d-s api change
 
diff --git a/sources b/sources
index c372891..df6fea3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86e5d2aefcbe68883d96edba61454fc9  folks-0.7.1.tar.xz
+dee614d09bfb6eab4c1ba3c743be03ba  folks-0.7.2.1.tar.xz