Hello community, here is the log from the commit of package telepathy-haze for openSUSE:Factory checked in at 2016-01-09 23:13:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-haze (Old) and /work/SRC/openSUSE:Factory/.telepathy-haze.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telepathy-haze" Changes: -------- --- /work/SRC/openSUSE:Factory/telepathy-haze/telepathy-haze.changes 2013-10-03 16:10:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.telepathy-haze.new/telepathy-haze.changes 2016-01-09 23:13:09.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 5 18:37:33 UTC 2016 - [email protected] + +- Add telepathy-haze-pidgin-2.10.12-compat.patch: fix compatibility + with recent versions of Pidgin. + +------------------------------------------------------------------- New: ---- telepathy-haze-pidgin-2.10.12-compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-haze.spec ++++++ --- /var/tmp/diff_new_pack.teivd4/_old 2016-01-09 23:13:10.000000000 +0100 +++ /var/tmp/diff_new_pack.teivd4/_new 2016-01-09 23:13:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package telepathy-haze # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,45 +16,44 @@ # -Url: http://telepathy.freedesktop.org/wiki/ - Name: telepathy-haze Version: 0.8.0 Release: 0 Summary: A libpurple connection manager for Telepathy License: GPL-2.0+ Group: Productivity/Networking/Instant Messenger +Url: http://telepathy.freedesktop.org/wiki/ Source: http://telepathy.freedesktop.org/releases/telepathy-haze/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM telepathy-haze-pidgin-2.10.12-compat.patch [email protected] -- Fix compatibility with recent versions of Pidgin. +Patch0: telepathy-haze-pidgin-2.10.12-compat.patch BuildRequires: libpurple-devel BuildRequires: libxslt-devel BuildRequires: telepathy-glib-devel >= 0.15.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -A connection manager for Telepathy that provides support for AIM, ICQ, -MSN, Yahoo! and Groupwise using Pidgin's libpurple. +A connection manager for Telepathy that provides support for XMPP, +AIM, ICQ, Yahoo! and Groupwise using Pidgin's libpurple. %prep %setup -q +%patch0 -p1 %build %configure -make %{?jobs:-j %jobs} +make %{?_smp_mflags} %install -%makeinstall +%make_install %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -%{__rm} -rf %{buildroot} - %files %defattr(-,root,root) -%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.haze.service %{_libexecdir}/telepathy-haze -%{_mandir}/man8/telepathy-haze.8.gz +%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.haze.service +%{_mandir}/man8/telepathy-haze.8%{?ext_man} %changelog ++++++ telepathy-haze-pidgin-2.10.12-compat.patch ++++++ --- a/src/media-stream.c +++ b/src/media-stream.c @@ -23,6 +23,7 @@ #include "config.h" #include "media-stream.h" +#include <libpurple/version.h> #include <libpurple/media/backend-iface.h> #include <string.h> #include <telepathy-glib/dbus.h> @@ -1076,7 +1077,11 @@ haze_media_stream_new_native_candidate ( if (proto == TP_MEDIA_STREAM_BASE_PROTO_UDP) protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_UDP; else if (proto == TP_MEDIA_STREAM_BASE_PROTO_TCP) +#if PURPLE_VERSION_CHECK (2, 10, 12) + protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE; +#else protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP; +#endif else DEBUG ("Unknown network protocol");
