diff --git a/pidgin-2.6.3.tar.bz2 b/pidgin-2.6.3.tar.bz2 deleted file mode 100644 index 86ed97a..0000000 --- a/pidgin-2.6.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0515a0add6b0b541160a5d13484f665964072ed331c3e59c65fb6086a070d2a1 -size 9093452 diff --git a/pidgin-2.6.4.tar.bz2 b/pidgin-2.6.4.tar.bz2 new file mode 100644 index 0000000..529f0af --- /dev/null +++ b/pidgin-2.6.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa907ace507708e4a4bae32cc81a6271fb6da8bc0458fd8fc97cc4429ec8be11 +size 9325043 diff --git a/pidgin-bnc548072.patch b/pidgin-bnc548072.patch deleted file mode 100644 index 3d5954d..0000000 --- a/pidgin-bnc548072.patch +++ /dev/null @@ -1,74 +0,0 @@ -# -# -# patch "libpurple/protocols/oscar/oscar.c" -# from [42bbc1a4ff0b9b66e5487d7171b3cba95b6b9bd5] -# to [6325eced5c6845cea48a229ec93c04e881daf2b8] -# -============================================================ ---- libpurple/protocols/oscar/oscar.c 42bbc1a4ff0b9b66e5487d7171b3cba95b6b9bd5 -+++ libpurple/protocols/oscar/oscar.c 6325eced5c6845cea48a229ec93c04e881daf2b8 -@@ -2874,25 +2874,46 @@ incomingim_chan4(OscarData *od, FlapConn - gchar **text; - text = g_strsplit(args->msg, "\376", 0); - if (text) { -- num = 0; -- for (i=0; iuin, text[i*2+2], text[i*2+1]); -- data->gc = gc; -- data->name = g_strdup(text[i*2+1]); -- data->nick = g_strdup(text[i*2+2]); -+ /* Read the number of contacts that we were sent */ -+ errno = 0; -+ num = strtoul(text[0], NULL, 10); - -- purple_request_action(gc, NULL, message, -- _("Do you want to add this buddy " -- "to your buddy list?"), -- PURPLE_DEFAULT_ACTION_NONE, -- purple_connection_get_account(gc), data->name, NULL, -- data, 2, -- _("_Add"), G_CALLBACK(purple_icq_buddyadd), -- _("_Decline"), G_CALLBACK(oscar_free_name_data)); -- g_free(message); -+ if (num > 0 && errno == 0) { -+ for (i=0; imsg, NULL); -+ purple_debug_error("oscar", "Unknown syntax parsing " -+ "ICQ buddies. args->msg=%s\n", tmp); -+ g_free(tmp); -+ break; -+ } -+ -+ message = g_strdup_printf(_("ICQ user %u has sent you a buddy: %s (%s)"), args->uin, text[i*2+2], text[i*2+1]); -+ -+ data = g_new(struct name_data, 1); -+ data->gc = gc; -+ data->name = g_strdup(text[i*2+1]); -+ data->nick = g_strdup(text[i*2+2]); -+ -+ purple_request_action(gc, NULL, message, -+ _("Do you want to add this buddy " -+ "to your buddy list?"), -+ PURPLE_DEFAULT_ACTION_NONE, -+ purple_connection_get_account(gc), data->name, NULL, -+ data, 2, -+ _("_Add"), G_CALLBACK(purple_icq_buddyadd), -+ _("_Decline"), G_CALLBACK(oscar_free_name_data)); -+ g_free(message); -+ } -+ } else { -+ gchar *tmp = g_strescape(args->msg, NULL); -+ purple_debug_error("oscar", "Unknown syntax parsing " -+ "ICQ buddies. args->msg=%s\n", tmp); -+ g_free(tmp); - } - g_strfreev(text); - } diff --git a/pidgin.changes b/pidgin.changes index 4a1d77b..6c8e956 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,81 @@ +------------------------------------------------------------------- +Sun Dec 6 03:40:23 CET 2009 - vuntz@opensuse.org + +- Update to version 2.6.4: + + libpurple: + - Actually emit the hold signal for media calls. + - Fix building the GnuTLS plugin with older versions of GnuTLS. + - Fix DNS TXT query resolution. + - Don't send Proxy-Authorization headers to HTTP proxy servers + until we've received a "407 Proxy Authentication Required" + response from the server. + - Added "MXit" protocol plugin, supported and maintained by the + MXit folks themselves. + + General: + - New 'plugins' sub-command to 'debug' command (i.e. '/debug + plugins') to announce the list of loaded plugins. + - Always rejoin open chats after an account reconnects. + + AIM and ICQ: + - Better rate limit calculations and other improvements. + - More detailed error messages when messages fail to send. + - The simultaneous login account option is respected when using + the clientLogin authentication method. + - Fix offline message retrieval (broken in 2.6.3) + - Fix handling of markup on some messages (broken in 2.6.2) + - Fix SSL when clientLogin is enabled. + - Fix sending and receiving Unicode characters in a Direct IM + + MSN: + - Fix various crashes. + - Don't forget display names for buddies. + - Fix more FQY 240 connection errors. + - Cache our own friendly name as the server no longer does that + for us. + + XMPP: + - Fix some crashes. + - Users connecting to Google Talk now have an "Initiate Chat" + context menu option for their buddies. + - Resolve an issue when connecting to iChat Server when no + resource is specified. + - Try to automatically find a STUN server by using an SRV + lookup on the account's domain, if no prefs is set for this. + - Only show the "send a file" option if the buddy supports one + of the file transfer methods supported by libpurple. + - Keep the avatar on the server if one is not set locally. + + Yahoo: + - Fix sending /buzz. + - Fix blocking behavior for federated (MSN/OCS/Sametime) + service users. + - Add support for adding OCS and Sametime buddies. OCS users + are added as "ocs/user@domain.tld" and Sametime users are + added as "ibm/sametime_id". + + Finch: + - The TinyURL plugin now creates shorter URLs for long + non-conversation URLs, e.g. URLs to open Inbox in Yahoo/MSN + protocols, or the Yahoo Captcha when joining chat rooms. + - Fix displaying umlauts etc. in non-utf8 locale. + + Pidgin: + - The userlist in a multiuser chat can be styled via gtkrc. + - Add a hold button to the media window. + - Fix a bug where the conversation backlog stops scrolling in a + very busy chat room. + - In the Conversation "Send To" menu, offline buddies appear + grayed out (but are still selectable). + + Pidgin Preference and Preference Window Changes: + - General reorganization of the preference window. + - Removed the "Use font from theme" and "Conversation Font" + preferences. This can be controlled from the Pidgin GTK+ + Theme Control plugin. + - The Browser and Proxy tabs show appropriate GNOME-specific + messages and allow launching the correct applications to + change the relevant GNOME preferences if found. +- Do not use the Tango and NLD icon themes for 11.2 and later. This + was discussed with Jakub Steiner. + +------------------------------------------------------------------- +Fri Dec 4 18:37:47 CET 2009 - sbrabec@suse.cz + +- Fixed openssl-certs dependency problem in SLE10. + ------------------------------------------------------------------- Thu Nov 26 17:58:29 CET 2009 - sbrabec@suse.cz diff --git a/pidgin.spec b/pidgin.spec index ec4db7d..ce25eae 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -1,5 +1,5 @@ # -# spec file for package pidgin (Version 2.6.3) +# spec file for package pidgin (Version 2.6.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,9 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client -Version: 2.6.3 +Version: 2.6.4 Release: 1 +# FIXME: remove workaround for ms_MY when https://bugzilla.novell.com/show_bug.cgi?id=561174 is fixed License: GPLv2+ Group: Productivity/Networking/Instant Messenger Url: http://www.pidgin.im/ @@ -40,8 +41,6 @@ Patch11: pidgin-directconn-argfix.patch Patch12: pidgin-dbus-invalid-gpointer.patch # PATCH-FIX-OPENSUSE pidgin-browser-default.patch bnc472219 sbrabec@suse.cz - Use xdg-open as default browser. Patch13: pidgin-browser-default.patch -# PATCH-FIX-UPSTREAM pidgin-bnc548072.patch bnc#548072 dimstar@opensuse.org -- Fix a crash on Oscar (icq) protocol. -Patch14: pidgin-bnc548072.patch Patch15: pidgin-bnc550170-qq-2008only.patch # Can use external libzephyr BuildRequires: cyrus-sasl-devel @@ -116,7 +115,9 @@ BuildRequires: avahi-devel avahi-glib %if %suse_version > 1030 Requires: libpurple-lang = %{version} %endif +%if %suse_version > 1020 Requires: openssl-certs +%endif Requires: perl-base = %{perl_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build # Existed before 10.3: @@ -167,7 +168,9 @@ Requires: libpurple-lang = %{version} # Needed for purple-url-handler: Requires: dbus-1-python Requires: perl = %{perl_version} +%if %suse_version > 1020 Requires: openssl-certs +%endif %package -n libpurple-devel License: GPLv2+ @@ -323,8 +326,10 @@ intltoolize --force %{makeinstall} %{perl_process_packlist} %suse_update_desktop_file -N Pidgin -G "Instant Messenger" %{name} +%if %suse_version < 1120 cp -a NLD $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/pidgin/emotes cp -a Tango $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/pidgin/emotes +%endif %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/*/*.la %{__rm} -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod %{__rm} -f $RPM_BUILD_ROOT%{_prefix}/lib/perl*/*/perllocal.pod @@ -411,9 +416,14 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -maxdepth 1 -xtype f -print | \ %files -n libpurple-lang -f %{name}.lang %endif -%if %suse_version < 1110 -# These locales are not yet included in respective products: %defattr(-, root, root) +# %if %suse_version < 1130 +# Directories not yet created in filesystem, see https://bugzilla.novell.com/show_bug.cgi?id=561174 +%dir %{_datadir}/locale/ms_MY +%dir %{_datadir}/locale/ms_MY/LC_MESSAGES +# %endif +%if %suse_version < 1110 +# These locales are not yet included in respective products: %dir %{_datadir}/locale/sr@latin %dir %{_datadir}/locale/sr@latin/LC_MESSAGES %endif