packages: telepathy-gabble/telepathy-gabble.spec, telepathy-gabble/jabberd-...

[patrys]

Author: patrys                       Date: Fri Jun 18 13:50:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- jabber at pld-linux.org is broken, patching for that
- rel 2

---- Files affected:
packages/telepathy-gabble:
   telepathy-gabble.spec (1.27 -> 1.28) , jabberd-compat.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/telepathy-gabble/telepathy-gabble.spec
diff -u packages/telepathy-gabble/telepathy-gabble.spec:1.27 packages/telepathy-gabble/telepathy-gabble.spec:1.28
--- packages/telepathy-gabble/telepathy-gabble.spec:1.27	Wed Jun 16 17:40:11 2010
+++ packages/telepathy-gabble/telepathy-gabble.spec	Fri Jun 18 15:50:01 2010
@@ -3,11 +3,12 @@
 Summary(pl.UTF-8):	Zarządca połączeń Telepathy dla Jabbera/XMPP
 Name:		telepathy-gabble
 Version:	0.9.13
-Release:	1
+Release:	2
 License:	LGPL
 Group:		Libraries
 Source0:	http://telepathy.freedesktop.org/releases/telepathy-gabble/%{name}-%{version}.tar.gz
 # Source0-md5:	2583938c52da620db076492569431bf6
+Patch0:		jabberd-compat.patch
 URL:		http://telepathy.freedesktop.org/wiki/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -77,6 +79,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2010/06/18 13:50:01  patrys
+- jabber at pld-linux.org is broken, patching for that
+- rel 2
+
 Revision 1.27  2010/06/16 15:40:11  patrys
 - 0.9.13
 

================================================================
Index: packages/telepathy-gabble/jabberd-compat.patch
diff -u /dev/null packages/telepathy-gabble/jabberd-compat.patch:1.1
--- /dev/null	Fri Jun 18 15:50:06 2010
+++ packages/telepathy-gabble/jabberd-compat.patch	Fri Jun 18 15:50:01 2010
@@ -0,0 +1,42 @@
+--- telepathy-gabble-0.9.13/src/connection.c~	2010-06-14 15:57:03.000000000 +0200
++++ telepathy-gabble-0.9.13/src/connection.c	2010-06-18 15:44:05.279021780 +0200
+@@ -1690,24 +1690,25 @@
+   if (disco_error != NULL)
+     {
+       DEBUG ("Got disco error on bare jid: %s", disco_error->message);
+-      return;
+     }
+-
+-  for (i = node_iter (result); i; i = node_iter_next (i))
++  else
+     {
+-      LmMessageNode *child = node_iter_data (i);
+-
+-      if (!tp_strdiff (child->name, "identity"))
++      for (i = node_iter (result); i; i = node_iter_next (i))
+         {
+-          const gchar *category = lm_message_node_get_attribute (child,
+-              "category");
+-          const gchar *type = lm_message_node_get_attribute (child, "type");
+-
+-          if (!tp_strdiff (category, "pubsub") &&
+-              !tp_strdiff (type, "pep"))
++          LmMessageNode *child = node_iter_data (i);
++    
++          if (!tp_strdiff (child->name, "identity"))
+             {
+-              DEBUG ("Server advertises PEP support in our jid features");
+-              conn->features |= GABBLE_CONNECTION_FEATURES_PEP;
++              const gchar *category = lm_message_node_get_attribute (child,
++                  "category");
++              const gchar *type = lm_message_node_get_attribute (child, "type");
++    
++              if (!tp_strdiff (category, "pubsub") &&
++                  !tp_strdiff (type, "pep"))
++                {
++                  DEBUG ("Server advertises PEP support in our jid features");
++                  conn->features |= GABBLE_CONNECTION_FEATURES_PEP;
++                }
+             }
+         }
+     }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/telepathy-gabble/telepathy-gabble.spec?r1=1.27&r2=1.28&f=u