From 4ad545d4bc47a137033994bfbcdd96c46be9a1a4 Mon Sep 17 00:00:00 2001
From: Brian Pepple <bpepple@fedoraproject.org>
Date: Aug 29 2011 14:35:07 +0000
Subject: Fix merge conflicts


---

diff --git a/.gitignore b/.gitignore
index 5a2bc6f..c9668c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /folks-0.4.2.tar.bz2
 /folks-0.5.2.tar.bz2
 /folks-0.6.0.tar.xz
+/folks-0.6.1.tar.xz
diff --git a/folks.spec b/folks.spec
index df7fdce..3954400 100644
--- a/folks.spec
+++ b/folks.spec
@@ -2,8 +2,8 @@
 
 Name:           folks
 Epoch:          1
-Version:        0.6.0
-Release:        6%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        GObject contact aggregation library
 
 Group:          System Environment/Libraries
@@ -11,9 +11,6 @@ License:        LGPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/Folks
 Source0:        http://download.gnome.org/sources/folks/0.6/%{name}-%{version}.tar.xz
 
-# upstream fix
-Patch0:         0001-Make-sure-we-pass-ENABLE_EDS-to-vala-flags.patch
-
 BuildRequires:  telepathy-glib-devel >= %{tp_glib_ver}
 BuildRequires:  telepathy-glib-vala
 BuildRequires:  glib2-devel
@@ -26,7 +23,6 @@ BuildRequires:  GConf2-devel
 BuildRequires:  evolution-data-server-devel >= 3.0.1
 BuildRequires:  libsocialweb-devel >= 0.25.15
 ## BuildRequires: tracker-devel >= 0.10
-BuildRequires:  autoconf automake libtool
 
 
 %description
@@ -89,6 +85,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Mon Aug 29 2011 Brian Pepple <bpepple@fedoraproject.org> - 1:0.6.1-1
+- Update to 0.6.1.
+- Drop EDS patch. Fixed upstream.
+
 * Mon Aug 29 2011 Milan Crha <mcrha@redhat.com> - 1:0.6.0-6
 - Rebuild against newer evolution-data-server
 
diff --git a/sources b/sources
index 7df3d06..682bce5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c0b0b304ad25b36ff326de3c3521a4e  folks-0.6.0.tar.xz
+64f9db1fc940d25add99105453638721  folks-0.6.1.tar.xz