From 0d5aa9f20e8f966bd7bcf16e81f60119b6c7bcce Mon Sep 17 00:00:00 2001
From: Brian Pepple <bpepple@fedoraproject.org>
Date: Nov 11 2011 16:06:31 +0000
Subject: Fix merge conflicts


---

diff --git a/.gitignore b/.gitignore
index faee759..02beaa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 /folks-0.6.3.tar.xz
 /folks-0.6.3.1.tar.xz
 /folks-0.6.3.2.tar.xz
+/folks-0.6.4.tar.xz
 /folks-0.6.4.1.tar.xz
+/folks-0.6.5.tar.xz
+
diff --git a/folks.spec b/folks.spec
index 2dda62c..b1aaf6e 100644
--- a/folks.spec
+++ b/folks.spec
@@ -2,8 +2,8 @@
 
 Name:           folks
 Epoch:          1
-Version:        0.6.4.1
-Release:        2%{?dist}
+Version:        0.6.5
+Release:        1%{?dist}
 Summary:        GObject contact aggregation library
 
 Group:          System Environment/Libraries
@@ -14,7 +14,7 @@ Source0:        http://download.gnome.org/sources/folks/0.6/%{name}-%{version}.t
 BuildRequires:  telepathy-glib-devel >= %{tp_glib_ver}
 BuildRequires:  telepathy-glib-vala
 BuildRequires:  glib2-devel
-BuildRequires:  vala-devel >= 0.13.0
+BuildRequires:  vala-devel >= 0.13.4
 BuildRequires:  vala-tools
 BuildRequires:  libxml2-devel
 BuildRequires:  gobject-introspection >= 0.9.12
@@ -83,11 +83,20 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
-* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.6.4.1-2
+* Fri Nov 11 2011 Brian Pepple <bpepple@fedoraproject.org> - 1:0.6.5-1
+- Update to 0.6.5.
+
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.6.4.1-3
 - Rebuilt for glibc bug#747377
 
-* Wed Oct 19 2011 Matthias Clasen <mclasen@redhat.com> - 1:0.6.4.1-1
-- Update to 0.6.4.1
+* Mon Oct 24 2011 Brian Pepple <bpepple@fedoraproject.org> - 1:0.6.4.1-2
+- Rebuld against libcamel.
+
+* Tue Oct 18 2011 Brian Pepple <bpepple@fedoraproject.org> - 1:0.6.4.1-1
+- Update to 0.6.4.1.
+
+* Tue Oct 18 2011 Brian Pepple <bpepple@fedoraproject.org> - 1:0.6.4-1
+- Update to 0.6.4.
 
 * Mon Sep 26 2011 Brian Pepple <bpepple@fedoraproject.org> - 1:0.6.3.2-1
 - Update to 0.6.3.2.
diff --git a/sources b/sources
index 09d050c..accfd3e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-aff70a91b3c5d688f1dfae4f734b15fe  folks-0.6.4.1.tar.xz
+31dce2251d3ab3323ac098eda820de1c  folks-0.6.5.tar.xz
+