Accepting request 75513 from GNOME:Apps

Pushing G:A

OBS-URL: https://build.opensuse.org/request/show/75513
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=75

pidgin-b1dfad7fa45e394c213a97053d7ed5926c69901d.patch

@@ -0,0 +1,17 @@
+#
+#
+# patch "libpurple/conversation.c"
+#  from [cd6817f4863abafef969359f65cc025f9483b401]
+#    to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803]
+#
+============================================================
+--- libpurple/conversation.c	cd6817f4863abafef969359f65cc025f9483b401
++++ libpurple/conversation.c	19aac10ceebae1ee28788b6f0c02bcfcff0c8803
+@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC
+ 	}
+ 
+ 	g_hash_table_remove_all(chat->users);
+-	chat->users = NULL;
+ 
+ 	g_list_free(users);
+ 	chat->in_room = NULL;

pidgin.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul  5 14:13:18 UTC 2011 - seife+obs@b1-systems.com
+
+- Add patch to fix "multiple display of room members in MUC"
+  http://developer.pidgin.im/ticket/14351, bnc#703584.
+- Export V=1 before make to enable verbose build of all code, not
+  only some of the subdirs.
+
 -------------------------------------------------------------------
 Fri Jun 24 11:51:57 CET 2011 - christoph.miebach@web.de
 

pidgin.spec

@@ -37,6 +37,8 @@ Patch1:         pidgin-gnome-keyring.patch
 Patch3:         pidgin-nonblock-common.patch
 Patch4:         pidgin-nonblock-gwim.patch
 Patch5:         pidgin-nonblock-common2.patch
+# PATCH-FIX-UPSTREAM http://developer.pidgin.im/ticket/14351#comment:6, bnc#703584, seife+obs@b1-systems.com -- multiple display of room members
+Patch13:        pidgin-b1dfad7fa45e394c213a97053d7ed5926c69901d.patch
 # PATCH-FIX-UPSTREAM pidgin-mono-buildfix.patch http://developer.pidgin.im/ticket/12506 dimstar@opensuse.org -- Fix build with mono plugin loader; missing include statements.
 Patch14:        pidgin-mono-buildfix.patch
 # PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch vuntz@opensuse.org -- Revert http://developer.pidgin.im/viewmtn/revision/info/f32151852a00fb5abd3fdccdd8df2419031666de as it breaks the build
@@ -329,6 +331,7 @@ translation-update-upstream
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch13 -p0
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
@@ -369,6 +372,8 @@ autoreconf -fi
 	--with-tclconfig=%{_libdir}\
 	--with-tkconfig=%{_libdir}\
 	--with-system-ssl-certs=/etc/ssl/certs
+# make sure all subprojects are built with verbose output
+export V=1
 # Mono bindings sometimes fail with parallel build enabled in pidgin-2.5.5:
 #%{__make} %{?jobs:-j%jobs}
 %{__make}