From 87b1e47c8b3fe680f599f3b0ec62f2ebe186ed12 Mon Sep 17 00:00:00 2001
From: Brian Pepple <bpepple@fedoraproject.org>
Date: Nov 18 2013 16:53:57 +0000
Subject: Fix merge errors


---

diff --git a/Remove_Assert.patch b/Remove_Assert.patch
new file mode 100644
index 0000000..05f810d
--- /dev/null
+++ b/Remove_Assert.patch
@@ -0,0 +1,22 @@
+diff -urp folks-0.9.6.OLD/folks/individual.c folks-0.9.6/folks/individual.c
+--- folks-0.9.6.OLD/folks/individual.c	2013-11-06 11:36:18.000000000 -0500
++++ folks-0.9.6/folks/individual.c	2013-11-18 09:33:25.852692525 -0500
+@@ -3418,7 +3418,6 @@ static void _folks_individual_persona_no
+ 		_tmp1_ = _tmp6_ == self;
+ 	}
+ 	_tmp7_ = _tmp1_;
+-	_vala_assert (_tmp7_, "ps.name == \"individual\" || (obj as Persona).individual == this");
+ 	{
+ 		FolksIndividual_Notifier* notifier_collection = NULL;
+ 		gint notifier_collection_length1 = 0;
+diff -urp folks-0.9.6.OLD/folks/individual.vala folks-0.9.6/folks/individual.vala
+--- folks-0.9.6.OLD/folks/individual.vala	2013-11-06 10:04:08.000000000 -0500
++++ folks-0.9.6/folks/individual.vala	2013-11-18 09:47:10.666380935 -0500
+@@ -1206,7 +1206,6 @@ public class Folks.Individual : Object,
+   private void _persona_notify_cb (Object obj, ParamSpec ps)
+     {
+       assert (obj is Persona);
+-      assert (ps.name == "individual" || (obj as Persona).individual == this);
+ 
+       foreach (var notifier in Individual._notifiers)
+         {
diff --git a/folks.spec b/folks.spec
index 89c36c9..98e8b99 100644
--- a/folks.spec
+++ b/folks.spec
@@ -6,13 +6,14 @@
 Name:           folks
 Epoch:          1
 Version:        0.9.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GObject contact aggregation library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/Folks
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.8/%{name}-%{version}.tar.xz
+Patch0:         Remove_Assert.patch
 
 BuildRequires:  telepathy-glib-devel >= %{tp_glib_ver}
 BuildRequires:  telepathy-glib-vala
@@ -63,6 +64,8 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .assert
+
 
 
 %build
@@ -115,6 +118,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Mon Nov 18 2013 Brian Pepple <bpepple@fedoraproject.org> - 1:0.9.6-2
+- Add patch to remove assert that was causing IRC crash. (#1031252)
+
 * Thu Nov 14 2013 Richard Hughes <rhughes@redhat.com> - 1:0.9.6-1
 - Update to 0.9.6