diff --git a/.gitignore b/.gitignore index 1a062d4..e704438 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ folks-0.6.7.tar.xz /folks-0.9.4.tar.xz /folks-0.9.5.tar.xz /folks-0.9.6.tar.xz +/folks-0.9.7.1.tar.xz diff --git a/Remove_Assert.patch b/Remove_Assert.patch deleted file mode 100644 index 05f810d..0000000 --- a/Remove_Assert.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 224c978..08a2b57 100644 --- a/folks.spec +++ b/folks.spec @@ -5,15 +5,14 @@ Name: folks Epoch: 1 -Version: 0.9.6 -Release: 5%{?dist} +Version: 0.9.7.1 +Release: 1%{?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 @@ -64,8 +63,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .assert - %build @@ -118,6 +115,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog +* Tue Jun 24 2014 Richard Hughes - 1:0.9.7.1-1 +- Update to 0.9.7.1 + * Sat Jun 07 2014 Fedora Release Engineering - 1:0.9.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index bfb09c5..5e0ad8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3759db485f9ac5fd6c28c47e89123b0 folks-0.9.6.tar.xz +18f3e0799fdea55be7e27bc16e73bd8a folks-0.9.7.1.tar.xz