[telepathy-mission-control] Add patch for upstream b.fd.o # 59468
Peter Robinson
pbrobinson at fedoraproject.org
Thu Jan 24 13:16:06 UTC 2013
commit a69a97ace4b3825b584d0698fd8f2ac32c388287
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Thu Jan 24 13:15:48 2013 +0000
Add patch for upstream b.fd.o # 59468
telepathy-mission-control.spec | 8 +++++++-
tmc-ignore-gk.patch | 22 ++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/telepathy-mission-control.spec b/telepathy-mission-control.spec
index 00c3376..052787a 100644
--- a/telepathy-mission-control.spec
+++ b/telepathy-mission-control.spec
@@ -2,7 +2,7 @@
Name: telepathy-mission-control
Version: 5.14.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
Summary: Central control for Telepathy connection manager
@@ -10,6 +10,8 @@ Group: System Environment/Libraries
License: LGPLv2
URL: http://telepathy.freedesktop.org/wiki/Mission_Control
Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+# https://bugs.freedesktop.org/show_bug.cgi?id=59468
+Patch0: tmc-ignore-gk.patch
BuildRequires: glib2-devel
BuildRequires: libxslt-devel
@@ -44,6 +46,7 @@ files for developing applications that use %{name}.
%prep
%setup -q
+%patch0 -p1 -b .ignore-gk
%build
@@ -88,6 +91,9 @@ fi
%changelog
+* Thu Jan 24 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1:5.14.0-2
+- Add patch for upstream b.fd.o # 59468
+
* Wed Oct 3 2012 Brian Pepple <bpepple at fedoraproject.org> - 1:5.14.0-1
- Update to 5.14.0
diff --git a/tmc-ignore-gk.patch b/tmc-ignore-gk.patch
new file mode 100644
index 0000000..a916b56
--- /dev/null
+++ b/tmc-ignore-gk.patch
@@ -0,0 +1,22 @@
+--- telepathy-mission-control-5.14.0/src/mcd-account-manager-default.c.orig 2012-09-21 15:54:18.000000000 +0100
++++ telepathy-mission-control-5.14.0/src/mcd-account-manager-default.c 2013-01-24 13:14:15.916698209 +0000
+@@ -335,14 +335,14 @@
+ "account", account,
+ "param", "password",
+ NULL);
++
++ /* behave as if it had already been deleted, i.e. we never
++ * actually found it... */
++ param = NULL;
++ value = NULL;
+ }
+
+ gnome_keyring_found_list_free (empathy_items);
+-
+- /* behave as if it had already been deleted, i.e. we never
+- * actually found it... */
+- param = NULL;
+- value = NULL;
+ }
+
+ if (param != NULL && value != NULL)
More information about the scm-commits
mailing list