[telepathy-salut/f16] v0.5.1
Daniel Drake
dsd at fedoraproject.org
Wed Sep 28 20:16:27 UTC 2011
commit dce2390cc8ccc497d03f13fa6948bda64cfde144
Author: Daniel Drake <dsd at laptop.org>
Date: Wed Sep 28 21:15:09 2011 +0100
v0.5.1
Needed to solve crashes with the new telepathy-glib version.
.gitignore | 1 +
no-xmldiff.patch | 23 ++++++++
olpc-activity-properties.patch | 115 ++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
telepathy-salut.spec | 19 +++++--
5 files changed, 155 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c67e900..44d5eb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
telepathy-salut-0.3.12.tar.gz
/telepathy-salut-0.3.13.tar.gz
/telepathy-salut-0.4.0.tar.gz
+/telepathy-salut-0.5.1.tar.gz
diff --git a/no-xmldiff.patch b/no-xmldiff.patch
new file mode 100644
index 0000000..0db742c
--- /dev/null
+++ b/no-xmldiff.patch
@@ -0,0 +1,23 @@
+Hack around xmldiff test requirement as xmldiff isn't in Fedora.
+We don't run the tests anyway.
+
+Fixes ./configure failure
+
+Index: telepathy-salut-0.5.1/configure.ac
+===================================================================
+--- telepathy-salut-0.5.1.orig/configure.ac
++++ telepathy-salut-0.5.1/configure.ac
+@@ -87,13 +87,6 @@ if test -z "$XSLTPROC"; then
+ AC_MSG_ERROR([xsltproc (from the libxslt source package) is required])
+ fi
+
+-dnl check for xmldiff
+-XMLDIFF=
+-AC_CHECK_PROGS([XMLDIFF], [xmldiff])
+-if test -z "$XMLDIFF"; then
+- AC_MSG_ERROR([xmldiff is required for the gibber tests])
+-fi
+-
+ AM_PATH_PYTHON([2.5])
+
+ # Check for a python >= 2.5 with twisted to run python tests
diff --git a/olpc-activity-properties.patch b/olpc-activity-properties.patch
new file mode 100644
index 0000000..55de23e
--- /dev/null
+++ b/olpc-activity-properties.patch
@@ -0,0 +1,115 @@
+From 8075e04490d656b3da9bc651497338cfb7adc94b Mon Sep 17 00:00:00 2001
+From: Jonny Lamb <jonny.lamb at collabora.co.uk>
+Date: Mon, 25 Jul 2011 13:44:24 +0000
+Subject: namespaces: add …/activity-properties constant
+
+This lets the thing build with --enable-olpc.
+
+Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
+---
+diff --git a/src/connection.c b/src/connection.c
+index ef26342..f340cf6 100644
+--- a/src/connection.c
++++ b/src/connection.c
+@@ -67,6 +67,7 @@
+ #include "si-bytestream-manager.h"
+ #include "tubes-manager.h"
+ #include "util.h"
++#include "namespaces.h"
+
+ #include "plugin-loader.h"
+
+@@ -3214,7 +3215,7 @@ salut_connection_olpc_observe_invitation (SalutConnection *self,
+ muc_ready_ctx *ctx;
+
+ props_node = wocky_node_get_child_ns (invite_node, "properties",
+- GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS);
++ NS_OLPC_ACTIVITY_PROPS);
+
+ if (props_node == NULL)
+ return;
+@@ -3409,7 +3410,7 @@ salut_connection_olpc_observe_muc_stanza (SalutConnection *self,
+ SalutOlpcActivity *activity;
+
+ props_node = wocky_node_get_child_ns (node, "properties",
+- GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS);
++ NS_OLPC_ACTIVITY_PROPS);
+
+ if (props_node == NULL)
+ return FALSE;
+@@ -3455,7 +3456,7 @@ uninvite_stanza_callback (WockyPorter *porter,
+ SalutContact *contact = SALUT_CONTACT (wocky_stanza_get_from_contact (stanza));
+
+ node = wocky_node_get_child_ns (top_node, "uninvite",
+- GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS);
++ NS_OLPC_ACTIVITY_PROPS);
+ g_assert (node != NULL);
+
+ room = wocky_node_get_attribute (node, "room");
+@@ -3514,7 +3515,7 @@ salut_connection_create_channel_factories (TpBaseConnection *base)
+ WOCKY_PORTER_HANDLER_PRIORITY_NORMAL,
+ uninvite_stanza_callback, self,
+ '(', "uninvite",
+- ':', GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS,
++ ':', NS_OLPC_ACTIVITY_PROPS,
+ ')', NULL);
+
+ /* create the OLPC activity manager */
+diff --git a/src/namespaces.h b/src/namespaces.h
+index e0d2834..2bf6bb2 100644
+--- a/src/namespaces.h
++++ b/src/namespaces.h
+@@ -115,4 +115,6 @@
+ #define NS_TEMPPRES "urn:xmpp:temppres:0"
+ #define NS_GOOGLE_SHARED_STATUS "google:shared-status"
+
++#define NS_OLPC_ACTIVITY_PROPS "http://laptop.org/xmpp/activity-properties"
++
+ #endif /* __GABBLE_NAMESPACES__H__ */
+diff --git a/src/olpc-activity.c b/src/olpc-activity.c
+index 6aacdba..98d33ae 100644
+--- a/src/olpc-activity.c
++++ b/src/olpc-activity.c
+@@ -29,6 +29,7 @@
+ #include "olpc-activity.h"
+ #include "muc-manager.h"
+ #include "util.h"
++#include "namespaces.h"
+
+ #include "signals-marshal.h"
+
+@@ -316,12 +317,12 @@ send_properties_change_msg (SalutOlpcActivity *self,
+ WOCKY_STANZA_SUB_TYPE_GROUPCHAT,
+ self->connection->name, muc_name,
+ WOCKY_NODE_START, "properties",
+- WOCKY_NODE_XMLNS, GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS,
++ WOCKY_NODE_XMLNS, NS_OLPC_ACTIVITY_PROPS,
+ WOCKY_NODE_END, NULL);
+ top_node = wocky_stanza_get_top_node (stanza);
+
+ properties_node = wocky_node_get_child_ns (top_node, "properties",
+- GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS);
++ NS_OLPC_ACTIVITY_PROPS);
+
+ salut_wocky_node_add_children_from_properties (properties_node,
+ properties, "property");
+@@ -620,7 +621,7 @@ salut_olpc_activity_revoke_invitations (SalutOlpcActivity *self)
+ WOCKY_STANZA_SUB_TYPE_NONE,
+ self->connection->name, NULL,
+ WOCKY_NODE_START, "uninvite",
+- WOCKY_NODE_XMLNS, GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS,
++ WOCKY_NODE_XMLNS, NS_OLPC_ACTIVITY_PROPS,
+ WOCKY_NODE_ATTRIBUTE, "room", tp_handle_inspect (room_repo,
+ self->room),
+ WOCKY_NODE_ATTRIBUTE, "id", self->id,
+@@ -673,7 +674,7 @@ salut_olpc_activity_augment_invitation (SalutOlpcActivity *self,
+ properties = salut_olpc_activity_create_properties_table (self);
+
+ properties_node = wocky_node_add_child_ns (invite_node, "properties",
+- GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS);
++ NS_OLPC_ACTIVITY_PROPS);
+
+ /* add the activity id */
+ activity_id_val = g_slice_new0 (GValue);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/sources b/sources
index 253de8a..d887df4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95f0cf9681912104474b0f4c4d00807f telepathy-salut-0.4.0.tar.gz
+8c9a0588d9b74c467a8b2dcb442efae1 telepathy-salut-0.5.1.tar.gz
diff --git a/telepathy-salut.spec b/telepathy-salut.spec
index 894d2bf..61087e3 100644
--- a/telepathy-salut.spec
+++ b/telepathy-salut.spec
@@ -1,12 +1,14 @@
Name: telepathy-salut
-Version: 0.4.0
-Release: 2%{?dist}
+Version: 0.5.1
+Release: 1%{?dist}
Summary: Link-local XMPP telepathy connection manager
Group: Applications/Communications
License: LGPLv2+
URL: http://telepathy.freedesktop.org/wiki/FrontPage
Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+Patch1: olpc-activity-properties.patch
+Patch2: no-xmldiff.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel >= 1.1.0
@@ -19,7 +21,11 @@ BuildRequires: libxslt
BuildRequires: libasyncns-devel >= 0.3
BuildRequires: telepathy-glib-devel >= 0.7.36
BuildRequires: libsoup-devel
-BuildRequires: check-devel >= 0.9.4
+BuildRequires: sqlite-devel
+BuildRequires: gtk-doc
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
Requires: telepathy-filesystem
@@ -33,9 +39,11 @@ local network using zero-configuration networking.
%prep
%setup -q
-
+%patch1 -p1
+%patch2 -p1
%build
+autoreconf -i
%configure --enable-ssl --enable-olpc
make %{?_smp_mflags}
@@ -55,6 +63,9 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/*.html
%{_mandir}/man8/%{name}.8.gz
%changelog
+* Wed Sep 28 2011 Daniel Drake <dsd at laptop.org> - 0.5.1-1
+- Update to 0.5.1
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list