From c6f29bf6ebb96d3b2847cac26c43f92f65ce9d923ad14a32629a75ea4c8d9a9a Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Fri, 10 Dec 2010 17:50:12 +0000
Subject: [PATCH] Accepting request 55326 from GNOME:Apps

Accepted submit request 55326 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/55326
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin-sipe?expand=0&rev=17
---
 pidgin-sipe-1.11.0.tar.bz2 |  3 ---
 pidgin-sipe-1.11.2.tar.bz2 |  3 +++
 pidgin-sipe.changes        | 22 +++++++++++++++++++++
 pidgin-sipe.spec           | 39 ++++++++++++++++++++++++++++++++++----
 4 files changed, 60 insertions(+), 7 deletions(-)
 delete mode 100644 pidgin-sipe-1.11.0.tar.bz2
 create mode 100644 pidgin-sipe-1.11.2.tar.bz2

diff --git a/pidgin-sipe-1.11.0.tar.bz2 b/pidgin-sipe-1.11.0.tar.bz2
deleted file mode 100644
index d09665b..0000000
--- a/pidgin-sipe-1.11.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5b4d9a7aae51ade245062d708425765f257ecafe7406249731f6048a29d8f5ac
-size 604411
diff --git a/pidgin-sipe-1.11.2.tar.bz2 b/pidgin-sipe-1.11.2.tar.bz2
new file mode 100644
index 0000000..9896b20
--- /dev/null
+++ b/pidgin-sipe-1.11.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90c424942cad50f271367acb0ddcf8e5c648d1aed1f395200e5d909515ce7ae9
+size 605656
diff --git a/pidgin-sipe.changes b/pidgin-sipe.changes
index a300e2f..df0d7bb 100644
--- a/pidgin-sipe.changes
+++ b/pidgin-sipe.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Nov 18 10:39:02 CET 2010 - dimstar@opensuse.org
+
+- Update to version 1.11.2:
+  + Sipe-sign: fix parsing of P-Asserted-Identity header
+  + Fixed memory leaks
+  + sf#3090663: Re-authentication fails
+  + sf#3091490: Make 1.11.0 Compile on FreeBSD
+  + sf#3092324: Core dump in "make check"
+- Changes from version 1.11.1:
+  + sf#2834758: First NTLM signature check after startup fails
+  + purple: fix memory leak in sipe_backend_transport_connect()
+    error path
+  + sf#3082602: Crash on Autodiscover
+  + Build fixes.
+
+-------------------------------------------------------------------
+Sun Oct 17 10:07:58 UTC 2010 - dimstar@opensuse.org
+
+- Some simple preparations to enable telepathy plugin once it
+  becomes available.
+
 -------------------------------------------------------------------
 Wed Oct  6 09:02:38 UTC 2010 - john@redux.org.uk
 
diff --git a/pidgin-sipe.spec b/pidgin-sipe.spec
index b0700be..c37f6db 100644
--- a/pidgin-sipe.spec
+++ b/pidgin-sipe.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package pidgin-sipe (Version 1.11.0)
+# spec file for package pidgin-sipe (Version 1.11.2)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -15,12 +15,13 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
+%define build_telepathy 0
 
 Name:           pidgin-sipe
-Version:        1.11.0
+Version:        1.11.2
 Release:        1
-# FIXME: enable telepathy plugin when it'll be available (not in 1.10.1)
+# FIXME: enable telepathy plugin when it'll be available (not in 1.11.0)
+# FIXME: enable kopete plugin when it'll be available (not in 1.11.0)
 License:        GPLv2+
 Summary:        Pidgin protocol plugin to connect to MS Office Communicator
 Url:            http://sipe.sourceforge.net/
@@ -38,6 +39,10 @@ BuildRequires:  libtool
 # For directory ownership
 BuildRequires:  pidgin
 BuildRequires:  translation-update-upstream
+BuildRequires:  pkgconfig(nss)
+%if %{build_telepathy}
+BuildRequires:  pkgconfig(telepathy-glib)
+%endif
 Requires:       libpurple-plugin-sipe = %{version}
 Requires:       pidgin
 Supplements:    packageand(libpurple-plugin-sipe:pidgin}
@@ -70,6 +75,22 @@ It implements the extended version of SIP/SIMPLE used by various products:
     * Microsoft Live Communications Server (LCS 2003/2005)
     * Reuters Messaging
 
+%if %{build_telepathy}
+%package -n telepathy-plugin-sipe
+License:        GPLv2+
+Summary:        Microsoft LCS/OCS connection manager for Telepathy
+Group:          Productivity/Networking/Instant Messenger
+
+%description -n telepathy-plugin-sipe
+A third-party connection manager for the telepathy multi-protocol instant
+messaging core. It implements the extended version of SIP/SIMPLE used by
+various products:
+
+    * Microsoft Office Communications Server (OCS 2007/2007 R2 and newer)
+    * Microsoft Live Communications Server (LCS 2003/2005)
+    * Reuters Messaging
+%endif
+
 %prep
 %setup -q
 translation-update-upstream
@@ -79,7 +100,11 @@ translation-update-upstream
 %configure \
         --with-krb5 \
         --enable-purple \
+%if %{build_telepathy}
+        --enable-telepathy
+%else
         --disable-telepathy
+%endif
 make %{_smp_mflags}
 
 %install
@@ -111,4 +136,10 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/pidgin/protocols/*/sipe.svg
 %endif
 
+%if %{build_telepathy}
+%files -n telepathy-plugin-sipe
+%defattr(-, root, root)
+%{_libexecdir}/telepathy-sipe
+%endif}
+
 %changelog