From 6969bc429f0ddeb689a47e76c4a4c9a12c79598c Mon Sep 17 00:00:00 2001
From: Brian Pepple <bpepple@fedoraproject.org>
Date: Oct 30 2013 14:30:03 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/0049-account-manager-avatar.py-fix-race-condition-by-comb.patch b/0049-account-manager-avatar.py-fix-race-condition-by-comb.patch
new file mode 100644
index 0000000..8c7687c
--- /dev/null
+++ b/0049-account-manager-avatar.py-fix-race-condition-by-comb.patch
@@ -0,0 +1,37 @@
+From 4a68477e5e501dc5e5932e1326e36fe964cce940 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: Tue, 29 Oct 2013 13:38:20 +0000
+Subject: [PATCH 49/49] account-manager/avatar.py: fix race condition by
+ combining expect_many calls
+
+The test account-storage plugin uses GDBus, so its signals have an
+undefined order with respect to MC's dbus-glib signals. We don't
+actually care about the order anyway, so expect them all in one
+big expect_many call.
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71001
+Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+---
+ tests/twisted/account-manager/avatar.py | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/tests/twisted/account-manager/avatar.py b/tests/twisted/account-manager/avatar.py
+index 8bae300..b31ab97 100644
+--- a/tests/twisted/account-manager/avatar.py
++++ b/tests/twisted/account-manager/avatar.py
+@@ -162,10 +162,8 @@ def test(q, bus, mc):
+                 interface=cs.TEST_DBUS_ACCOUNT_PLUGIN_IFACE,
+                 signal='DeferringSetAttribute',
+                 args=[account.object_path, 'AvatarMime', '']),
+-            )
+-    q.expect('dbus-signal', path=account.object_path,
+-             interface=cs.ACCOUNT_IFACE_AVATAR, signal='AvatarChanged')
+-    q.expect_many(
++            EventPattern('dbus-signal', path=account.object_path,
++                interface=cs.ACCOUNT_IFACE_AVATAR, signal='AvatarChanged'),
+             EventPattern('dbus-signal',
+                 interface=cs.TEST_DBUS_ACCOUNT_PLUGIN_IFACE,
+                 signal='CommittingOne',
+-- 
+1.8.3.1
+
diff --git a/sources b/sources
index 0c1ecbb..461cd15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0efd7d9043f6e189e8ed8111d043b52c  telepathy-mission-control-5.15.0.tar.gz
+736ae9d71028d8e6d95017433c07fa06  telepathy-mission-control-5.16.0.tar.gz
diff --git a/telepathy-mission-control.spec b/telepathy-mission-control.spec
index d5c20f5..165ab34 100644
--- a/telepathy-mission-control.spec
+++ b/telepathy-mission-control.spec
@@ -1,7 +1,7 @@
 %define tp_glib_ver 0.17.5
 
 Name:           telepathy-mission-control
-Version:        5.15.0
+Version:        5.16.0
 Release:        2%{?dist}
 Epoch:          1
 Summary:        Central control for Telepathy connection manager
@@ -11,13 +11,18 @@ License:        LGPLv2
 URL:            http://telepathy.freedesktop.org/wiki/Mission_Control
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 
+## upstream patches
+# fix failing avatar test, https://bugs.freedesktop.org/show_bug.cgi?id=71001
+Patch0049: 0049-account-manager-avatar.py-fix-race-condition-by-comb.patch
+
 BuildRequires:  chrpath
+BuildRequires:  dbus-python
 BuildRequires:  glib2-devel
 BuildRequires:  libxslt-devel
-BuildRequires:  libgnome-keyring-devel
 BuildRequires:  NetworkManager-glib-devel
+BuildRequires:  pygobject2
+BuildRequires:  python-twisted-core
 BuildRequires:  telepathy-glib-devel >= %{tp_glib_ver}
-BuildRequires:  upower-devel
 BuildRequires:  gtk-doc
 
 
@@ -45,10 +50,11 @@ files for developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0049 -p1 -b .0049
 
 
 %build
-%configure --disable-static --enable-gnome-keyring --enable-gtk-doc --enable-mcd-plugins --with-connectivity=nm --enable-upower
+%configure --disable-static --enable-gtk-doc --enable-mcd-plugins --with-connectivity=nm --disable-upower
 
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -66,6 +72,10 @@ chrpath --delete %{buildroot}%{_libexecdir}/mission-control-5
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 
+%check
+make check
+
+
 %post -p /sbin/ldconfig
 
 
@@ -97,6 +107,21 @@ fi
 
 
 %changelog
+* Wed Oct 30 2013 Rex Dieter <rdieter@fedoraproject.org> - 1:5.16.0-2
+- --disable-upower
+
+* Thu Oct  3 2013 Brian Pepple <bpepple@fedoraproject.org> - 1:5.16.0-1
+- Update to 5.16.0.
+
+* Thu Sep 19 2013 Debarshi Ray <rishi@fedoraproject.org> - 1:5.15.1-1
+- Update to 5.15.1
+
+* Thu Sep 19 2013 Debarshi Ray <rishi@fedoraproject.org> - 1:5.15.0-4
+- Enable the Python tests
+
+* Thu Sep 19 2013 Debarshi Ray <rishi@fedoraproject.org> - 1:5.15.0-3
+- Add %%check to run the upstream test suite on each build
+
 * Mon Aug 26 2013 Kalev Lember <kalevlember@gmail.com> - 1:5.15.0-2
 - Fix the build