diff --git a/.gitignore b/.gitignore index fa70c4e..31d3899 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1 @@ -/folks-0.1.14.tar.bz2 -/folks-0.1.14.1.tar.bz2 -/folks-0.1.15.tar.bz2 -/folks-0.1.16.tar.bz2 -/folks-0.1.17.tar.bz2 -/folks-0.2.0.tar.bz2 -/folks-0.3.1.tar.bz2 -/folks-0.2.1.tar.bz2 -/folks-0.3.2.tar.bz2 -/folks-0.3.3.tar.bz2 -/folks-0.3.4.tar.bz2 -/folks-0.3.6.tar.bz2 -/folks-0.4.0.tar.bz2 -/folks-0.4.1.tar.bz2 -/folks-0.4.2.tar.bz2 -/folks-0.5.2.tar.bz2 -/folks-0.6.0.tar.xz -/folks-0.6.1.tar.xz -/folks-0.6.2.tar.xz -/folks-0.6.2.1.tar.xz +/folks-0.6.3.tar.xz diff --git a/folks-typelib.patch b/folks-typelib.patch deleted file mode 100644 index 76fe570..0000000 --- a/folks-typelib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up folks-0.6.2.1/folks/Makefile.am.typelib folks-0.6.2.1/folks/Makefile.am ---- folks-0.6.2.1/folks/Makefile.am.typelib 2011-09-14 17:16:03.150226985 -0400 -+++ folks-0.6.2.1/folks/Makefile.am 2011-09-14 17:16:26.251435649 -0400 -@@ -118,7 +118,7 @@ GITIGNOREFILES = \ - -include $(INTROSPECTION_MAKEFILE) - INTROSPECTION_GIRS = - INTROSPECTION_SCANNER_ARGS = --INTROSPECTION_COMPILER_ARGS = -l libfolks.so -+INTROSPECTION_COMPILER_ARGS = -l libfolks.so.25 - - if HAVE_INTROSPECTION - Folks-$(API_VERSION).gir: libfolks.la diff --git a/folks.spec b/folks.spec index c65b188..a9e3c63 100644 --- a/folks.spec +++ b/folks.spec @@ -2,8 +2,8 @@ Name: folks Epoch: 1 -Version: 0.6.2.1 -Release: 2%{?dist} +Version: 0.6.3 +Release: 1%{?dist} Summary: GObject contact aggregation library Group: System Environment/Libraries @@ -11,21 +11,18 @@ License: LGPLv2+ URL: http://telepathy.freedesktop.org/wiki/Folks Source0: http://download.gnome.org/sources/folks/0.6/%{name}-%{version}.tar.xz -# https://bugzilla.gnome.org/show_bug.cgi?id=658002 -Patch0: folks-typelib.patch - BuildRequires: telepathy-glib-devel >= %{tp_glib_ver} BuildRequires: telepathy-glib-vala BuildRequires: glib2-devel BuildRequires: vala-devel >= 0.13.0 BuildRequires: vala-tools -BuildRequires: libgee-devel BuildRequires: libxml2-devel BuildRequires: gobject-introspection >= 0.9.12 BuildRequires: GConf2-devel -BuildRequires: evolution-data-server-devel >= 3.0.1 +BuildRequires: evolution-data-server-devel >= 3.1.5 BuildRequires: libsocialweb-devel >= 0.25.15 ## BuildRequires: tracker-devel >= 0.10 +BuildRequires: pkgconfig(gee-1.0) %description @@ -39,9 +36,9 @@ Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: telepathy-glib-devel >= %{tp_glib_ver} -Requires: libgee-devel Requires: glib2-devel Requires: pkgconfig +Requires: pkgconfig(gee-1.0) %description devel The %{name}-devel package contains libraries and header files for @@ -50,12 +47,7 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -autoreconf -i -f -# Mistakenly distributed -# https://bugzilla.gnome.org/show_bug.cgi?id=659095 -rm folks/Folks-*.typelib %build %configure --disable-static --enable-eds-backend @@ -91,6 +83,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Mon Sep 19 2011 Brian Pepple - 1:0.6.3-1 +- Update to 0.6.3. +- Drop typelib patch. Fixed upstream. + * Wed Sep 14 2011 Owen Taylor - 1:0.6.2.1-2 - Really fix the typelib to embed the right .so file @@ -101,7 +97,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - Fix a reentrancy problem that causes gnome-shell to crash * Thu Sep 8 2011 Matthias Clasen - 1:0.6.2-1 +- Update to 0.6.2.1 + +* Thu Sep 8 2011 Brian Pepple - 1:0.6.2-1 - Update to 0.6.2 +- Use old libgee api. * Wed Sep 7 2011 Matthias Clasen - 1:0.6.1-4 - Try again diff --git a/reentrancy-is-the-suck.patch b/reentrancy-is-the-suck.patch deleted file mode 100644 index e6a4c82..0000000 --- a/reentrancy-is-the-suck.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit b00dc238aa393a6047b23df39269be00d2342ae2 -Author: Raul Gutierrez Segales -Date: Thu Sep 8 18:19:35 2011 +0100 - - IndividualAggregator: copy the list of stores before looping over it - - Because a Backend's list of PersonaStores can change while we are - iterating it, we do a copy before starting. - - Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=658580 - -diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala -index 4b158ae..a863800 100644 ---- a/folks/individual-aggregator.vala -+++ b/folks/individual-aggregator.vala -@@ -548,8 +548,13 @@ public class Folks.IndividualAggregator : Object - backend.notify["is-quiescent"].connect ( - this._backend_is_quiescent_changed_cb); - -- /* handle the stores that have already been signaled */ -- foreach (var persona_store in backend.persona_stores.values) -+ /* Handle the stores that have already been signaled. Since -+ * this might change while we are looping, get a copy first. -+ * -+ * https://bugzilla.gnome.org/show_bug.cgi?id=658580 -+ */ -+ var stores = backend.persona_stores.values.to_array (); -+ foreach (var persona_store in stores) - { - this._backend_persona_store_added_cb (backend, persona_store); - } diff --git a/sources b/sources index 28f40f9..3a0995b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -1c1771a9424a4f231cd020a7deeb8679 folks-0.6.2.1.tar.xz +aac3977c970d6b38548620bcdbc79ae5 folks-0.6.3.tar.xz +