From decb3aa154a591760f81aeda6f106961bc58c8db Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Dec 27 2008 00:03:50 +0000 Subject: 2.5.3 --- diff --git a/.cvsignore b/.cvsignore index 548c8fc..10870ad 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pidgin-2.5.2.tar.bz2 +pidgin-2.5.3.tar.bz2 diff --git a/pidgin-2.4.2-reread-resolvconf.patch b/pidgin-2.4.2-reread-resolvconf.patch deleted file mode 100644 index 7f50e18..0000000 --- a/pidgin-2.4.2-reread-resolvconf.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up pidgin-2.4.2/libpurple/connection.c.resolv pidgin-2.4.2/libpurple/connection.c ---- pidgin-2.4.2/libpurple/connection.c.resolv 2008-02-02 10:09:14.000000000 -0500 -+++ pidgin-2.4.2/libpurple/connection.c 2008-05-17 10:42:56.000000000 -0400 -@@ -40,6 +40,10 @@ - - #define KEEPALIVE_INTERVAL 30 - -+#include -+#include -+#include -+ - static GList *connections = NULL; - static GList *connections_connecting = NULL; - static PurpleConnectionUiOps *connection_ui_ops = NULL; -@@ -153,6 +157,9 @@ purple_connection_new(PurpleAccount *acc - - purple_signal_emit(purple_connections_get_handle(), "signing-on", gc); - -+ /* Re-read resolv.conf and friends in case DNS servers have changed */ -+ res_init(); -+ - if (regist) - { - purple_debug_info("connection", "Registering. gc = %p\n", gc); -diff -up pidgin-2.4.2/libpurple/network.c.resolv pidgin-2.4.2/libpurple/network.c ---- pidgin-2.4.2/libpurple/network.c.resolv 2008-05-16 11:36:56.000000000 -0400 -+++ pidgin-2.4.2/libpurple/network.c 2008-05-17 10:46:47.000000000 -0400 -@@ -624,8 +624,6 @@ nm_update_state(NMState state) - switch(state) - { - case NM_STATE_CONNECTED: -- /* Call res_init in case DNS servers have changed */ -- res_init(); - if (ui_ops != NULL && ui_ops->network_connected != NULL) - ui_ops->network_connected(); - prev = state; diff --git a/pidgin-2.5.2-GtkIMHtmlSmileys-remove-crash.patch b/pidgin-2.5.2-GtkIMHtmlSmileys-remove-crash.patch deleted file mode 100644 index 2f0e6ed..0000000 --- a/pidgin-2.5.2-GtkIMHtmlSmileys-remove-crash.patch +++ /dev/null @@ -1,72 +0,0 @@ -http://developer.pidgin.im/viewmtn/revision/info/633ffe234af48ead3631ae62e23840b4438fcf5f -Don't try to remove GtkIMHtmlSmileys from smiley trees if the GtkIMHtml -that the smiley refers to doesn't exist anymore. -Yes, I know this is a bit hacky, but I couldn't find another obvious way to do -it without adding stuff in gtksmiley.c... -http://developer.pidgin.im/viewmtn/revision/info/9a91956125003141d6eb6d89094aa76ae479879a -Remove that hack involving GtkIMHtmlSmileys -Thanks to Sadrul for hinting about the solution - -diff -urN pidgin-2.5.2.orig/pidgin/gtkimhtml.c pidgin-2.5.2/pidgin/gtkimhtml.c ---- pidgin-2.5.2.orig/pidgin/gtkimhtml.c 2008-11-21 14:43:49.000000000 -0500 -+++ pidgin-2.5.2/pidgin/gtkimhtml.c 2008-11-21 14:48:32.000000000 -0500 -@@ -2054,12 +2054,23 @@ - } - - static void -+gtk_imhtml_disconnect_smiley(GtkIMHtml *imhtml, GtkIMHtmlSmiley *smiley) -+{ -+ smiley->imhtml = NULL; -+ g_signal_handlers_disconnect_matched(imhtml, G_SIGNAL_MATCH_DATA, 0, 0, -+ NULL, NULL, smiley); -+} -+ -+static void - gtk_imhtml_disassociate_smiley(GtkIMHtmlSmiley *smiley) - { - if (smiley->imhtml) { - gtk_smiley_tree_remove(smiley->imhtml->default_smilies, smiley); - g_hash_table_foreach(smiley->imhtml->smiley_data, - gtk_imhtml_disassociate_smiley_foreach, smiley); -+ g_signal_handlers_disconnect_matched(smiley->imhtml, G_SIGNAL_MATCH_DATA, -+ 0, 0, NULL, NULL, smiley); -+ smiley->imhtml = NULL; - } - } - -@@ -2079,9 +2090,19 @@ - g_hash_table_insert(imhtml->smiley_data, g_strdup(sml), tree); - } - -+ /* need to disconnect old imhtml, if there is one */ -+ if (smiley->imhtml) { -+ g_signal_handlers_disconnect_matched(smiley->imhtml, G_SIGNAL_MATCH_DATA, -+ 0, 0, NULL, NULL, smiley); -+ } -+ - smiley->imhtml = imhtml; - - gtk_smiley_tree_insert (tree, smiley); -+ -+ /* connect destroy signal for the imhtml */ -+ g_signal_connect(imhtml, "destroy", G_CALLBACK(gtk_imhtml_disconnect_smiley), -+ smiley); - } - - static gboolean -diff -urN pidgin-2.5.2.orig/pidgin/gtkthemes.c pidgin-2.5.2/pidgin/gtkthemes.c ---- pidgin-2.5.2.orig/pidgin/gtkthemes.c 2008-06-12 00:25:39.000000000 -0400 -+++ pidgin-2.5.2/pidgin/gtkthemes.c 2008-11-21 14:49:03.000000000 -0500 -@@ -169,6 +169,12 @@ - for (wer = theme->list; wer != NULL; wer = theme->list) { - while (wer->smileys) { - GtkIMHtmlSmiley *uio = wer->smileys->data; -+ -+ if (uio->imhtml) { -+ g_signal_handlers_disconnect_matched(uio->imhtml, G_SIGNAL_MATCH_DATA, -+ 0, 0, NULL, NULL, uio); -+ } -+ - if (uio->icon) - g_object_unref(uio->icon); - if (g_hash_table_lookup(already_freed, uio->file) == NULL) { diff --git a/pidgin-2.5.2-NetworkManager-improvement.patch b/pidgin-2.5.2-NetworkManager-improvement.patch deleted file mode 100644 index f2cc44a..0000000 --- a/pidgin-2.5.2-NetworkManager-improvement.patch +++ /dev/null @@ -1,116 +0,0 @@ -http://developer.pidgin.im/viewmtn/revision/info/c4db69fe62c1650d1fb404a8bbb12bf47852f70c -Improve our NetworkManager support in a couple of ways: -* We no longer show error minidialogs when the network is not available. -* We no longer ask NetworkManager (over DBus) for the network state with -every call to purple_network_is_available(). We now cache the result. -* Be a little more robust when we're not sure of the connection status. -Fixes #7323 - -diff -urN pidgin-2.5.2.orig/libpurple/network.c pidgin-2.5.2/libpurple/network.c ---- pidgin-2.5.2.orig/libpurple/network.c 2008-11-20 15:32:49.000000000 -0500 -+++ pidgin-2.5.2/libpurple/network.c 2008-11-21 13:34:33.000000000 -0500 -@@ -66,6 +66,8 @@ - static DBusGConnection *nm_conn = NULL; - static DBusGProxy *nm_proxy = NULL; - static DBusGProxy *dbus_proxy = NULL; -+static NMState nm_state = NM_STATE_UNKNOWN; -+static gboolean have_nm_state = FALSE; - - #elif defined _WIN32 - static int current_network_count; -@@ -596,13 +598,15 @@ - purple_network_is_available(void) - { - #ifdef HAVE_NETWORKMANAGER -- NMState state = nm_get_network_state(); -- if (state == NM_STATE_UNKNOWN) -+ if (!have_nm_state) - { -- purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n"); -- return TRUE; -+ have_nm_state = TRUE; -+ nm_state = nm_get_network_state(); -+ if (nm_state == NM_STATE_UNKNOWN) -+ purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n"); - } -- else if (state == NM_STATE_CONNECTED) -+ -+ if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED) - return TRUE; - - return FALSE; -@@ -618,9 +622,12 @@ - static void - nm_update_state(NMState state) - { -- static NMState prev = NM_STATE_UNKNOWN; -+ NMState prev = nm_state; - PurpleConnectionUiOps *ui_ops = purple_connections_get_ui_ops(); - -+ have_nm_state = TRUE; -+ nm_state = state; -+ - purple_signal_emit(purple_network_get_handle(), "network-configuration-changed", NULL); - - switch(state) -@@ -628,16 +635,14 @@ - case NM_STATE_CONNECTED: - if (ui_ops != NULL && ui_ops->network_connected != NULL) - ui_ops->network_connected(); -- prev = state; - break; - case NM_STATE_ASLEEP: - case NM_STATE_CONNECTING: - case NM_STATE_DISCONNECTED: -- if (prev != NM_STATE_CONNECTED) -+ if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) - break; - if (ui_ops != NULL && ui_ops->network_disconnected != NULL) - ui_ops->network_disconnected(); -- prev = state; - break; - case NM_STATE_UNKNOWN: - default: -@@ -662,7 +667,6 @@ - return NM_STATE_UNKNOWN; - - if (!dbus_g_proxy_call(nm_proxy, "state", &err, G_TYPE_INVALID, G_TYPE_UINT, &state, G_TYPE_INVALID)) { -- /* XXX: Print an error? */ - g_error_free(err); - return NM_STATE_UNKNOWN; - } -diff -urN pidgin-2.5.2.orig/libpurple/prpl.c pidgin-2.5.2/libpurple/prpl.c ---- pidgin-2.5.2.orig/libpurple/prpl.c 2008-08-06 17:57:06.000000000 -0400 -+++ pidgin-2.5.2/libpurple/prpl.c 2008-11-21 13:34:43.000000000 -0500 -@@ -23,6 +23,7 @@ - #include "internal.h" - #include "conversation.h" - #include "debug.h" -+#include "network.h" - #include "notify.h" - #include "prpl.h" - #include "request.h" -@@ -317,7 +318,8 @@ - PurplePluginProtocolInfo *prpl_info; - - if (purple_status_is_online(new_status) && -- purple_account_is_disconnected(account)) -+ purple_account_is_disconnected(account) && -+ purple_network_is_available()) - { - purple_account_connect(account); - return; -diff -urN pidgin-2.5.2.orig/pidgin/gtkconn.c pidgin-2.5.2/pidgin/gtkconn.c ---- pidgin-2.5.2.orig/pidgin/gtkconn.c 2008-09-29 20:00:28.000000000 -0400 -+++ pidgin-2.5.2/pidgin/gtkconn.c 2008-11-21 13:34:49.000000000 -0500 -@@ -208,9 +208,7 @@ - while (l) { - PurpleAccount *a = (PurpleAccount*)l->data; - if (!purple_account_is_disconnected(a)) { -- purple_connection_error_reason(purple_account_get_connection(a), -- PURPLE_CONNECTION_ERROR_NETWORK_ERROR, -- _("Network disconnected")); -+ purple_account_disconnect(a); - } - l = l->next; - } diff --git a/pidgin-2.5.2-no-password-in-dialog-if-not-remembering.patch b/pidgin-2.5.2-no-password-in-dialog-if-not-remembering.patch deleted file mode 100644 index 1dacf17..0000000 --- a/pidgin-2.5.2-no-password-in-dialog-if-not-remembering.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://developer.pidgin.im/viewmtn/revision/info/8ae38e4108c4c7c302ab389b0491db4a884bad40 -Don't populate the password field on the modify account dialog if we are -not actually remembering it permanently - -diff -urN pidgin-2.5.2.orig/pidgin/gtkaccount.c pidgin-2.5.2/pidgin/gtkaccount.c ---- pidgin-2.5.2.orig/pidgin/gtkaccount.c 2008-10-18 12:51:50.000000000 -0400 -+++ pidgin-2.5.2/pidgin/gtkaccount.c 2008-11-21 13:44:19.000000000 -0500 -@@ -562,7 +562,8 @@ - - /* Set the fields. */ - if (dialog->account != NULL) { -- if (purple_account_get_password(dialog->account)) -+ if (purple_account_get_password(dialog->account) && -+ purple_account_get_remember_password(dialog->account)) - gtk_entry_set_text(GTK_ENTRY(dialog->password_entry), - purple_account_get_password(dialog->account)); - diff --git a/pidgin-2.5.2-remove-dialog-from-open-dialog-list.patch b/pidgin-2.5.2-remove-dialog-from-open-dialog-list.patch deleted file mode 100644 index ca7c8fe..0000000 --- a/pidgin-2.5.2-remove-dialog-from-open-dialog-list.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://developer.pidgin.im/viewmtn/revision/info/e05d46b1a88dfa81c3cc655bf9ab3e90bb6be828 -Fix an assertion failure/unlikely crash when: -1. Open a purple_notify_formatted() dialog, such as the QQ about window -or the AIM "who am I waiting on authorization from?" dialog -2. Close the dialog with the close button -3. Sign off the account -The problem is that the dialog was closed, but it was not removed from -the list of open dialogs. So purple_notify_close_with_handle() tried -to close it again. - -diff -urN pidgin-2.5.2.orig/pidgin/gtknotify.c pidgin-2.5.2/pidgin/gtknotify.c ---- pidgin-2.5.2.orig/pidgin/gtknotify.c 2008-08-29 21:53:56.000000000 -0400 -+++ pidgin-2.5.2/pidgin/gtknotify.c 2008-11-21 14:55:56.000000000 -0500 -@@ -703,7 +703,7 @@ - gtk_widget_grab_focus(button); - - g_signal_connect_swapped(G_OBJECT(button), "clicked", -- G_CALLBACK(gtk_widget_destroy), window); -+ G_CALLBACK(formatted_close_cb), window); - g_signal_connect(G_OBJECT(window), "key_press_event", - G_CALLBACK(formatted_input_cb), NULL); - diff --git a/pidgin-2.5.2-sametime-redirect-null.patch b/pidgin-2.5.2-sametime-redirect-null.patch deleted file mode 100644 index 5b50d32..0000000 --- a/pidgin-2.5.2-sametime-redirect-null.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugzilla.redhat.com/show_bug.cgi?id=471938 -pidgin segfaults on sametime/meanwhile login redirect to NULL - -diff -urN pidgin-2.5.2.orig/libpurple/protocols/sametime/sametime.c pidgin-2.5.2/libpurple/protocols/sametime/sametime.c ---- pidgin-2.5.2.orig/libpurple/protocols/sametime/sametime.c 2008-08-07 09:31:09.000000000 -0400 -+++ pidgin-2.5.2/libpurple/protocols/sametime/sametime.c 2008-11-20 16:18:18.000000000 -0500 -@@ -1444,7 +1444,8 @@ - current_host = purple_account_get_string(account, MW_KEY_HOST, - MW_PLUGIN_DEFAULT_HOST); - -- if(purple_account_get_bool(account, MW_KEY_FORCE, FALSE) || -+ if((! host) || -+ purple_account_get_bool(account, MW_KEY_FORCE, FALSE) || - (! strcmp(current_host, host)) || - (purple_proxy_connect(NULL, account, host, port, connect_cb, pd) == NULL)) { - diff --git a/pidgin-2.5.2-smilie-theme-change-crash.patch b/pidgin-2.5.2-smilie-theme-change-crash.patch deleted file mode 100644 index 4660160..0000000 --- a/pidgin-2.5.2-smilie-theme-change-crash.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://developer.pidgin.im/viewmtn/revision/info/5ccc437b944e0675b75037409a01416e31650e7f -What was I thinking... The GtkIMHtmlSmileys in the smiley trees aren't owned -by the smiley trees, so NULLing a pointer in there is not a good idea... -By the time gtk_smiley_tree_destroy is called the smileys are gone. -This should fix #7345 and that "crash when changing smiley theme while there -are smileys in input boxes" bug someone reported on #pidgin -Closes #7345 - -diff -urN pidgin-2.5.2.orig/pidgin/gtkimhtml.c pidgin-2.5.2/pidgin/gtkimhtml.c ---- pidgin-2.5.2.orig/pidgin/gtkimhtml.c 2008-09-28 20:43:24.000000000 -0400 -+++ pidgin-2.5.2/pidgin/gtkimhtml.c 2008-11-21 14:36:42.000000000 -0500 -@@ -348,9 +348,7 @@ - g_string_free (t->values, TRUE); - g_free (t->children); - } -- if (t && t->image) { -- t->image->imhtml = NULL; -- } -+ - g_free (t); - } - } diff --git a/pidgin-2.5.2-temporarily-remember-password-during-auto-reconnect.patch b/pidgin-2.5.2-temporarily-remember-password-during-auto-reconnect.patch deleted file mode 100644 index d0f4bf4..0000000 --- a/pidgin-2.5.2-temporarily-remember-password-during-auto-reconnect.patch +++ /dev/null @@ -1,19 +0,0 @@ -http://developer.pidgin.im/viewmtn/revision/info/bcd6dbfb605e7969c586fa89f022a3877b9a8c48 -Temporarily remember account password across network disconnection to allow -automatic reconnection when the network returns to work even if the -password is not permanently saved. - -diff -urN pidgin-2.5.2.orig/pidgin/gtkconn.c pidgin-2.5.2/pidgin/gtkconn.c ---- pidgin-2.5.2.orig/pidgin/gtkconn.c 2008-11-21 13:51:35.000000000 -0500 -+++ pidgin-2.5.2/pidgin/gtkconn.c 2008-11-21 13:53:03.000000000 -0500 -@@ -208,7 +208,10 @@ - while (l) { - PurpleAccount *a = (PurpleAccount*)l->data; - if (!purple_account_is_disconnected(a)) { -+ char *password = g_strdup(purple_account_get_password(a)); - purple_account_disconnect(a); -+ purple_account_set_password(a, password); -+ g_free(password); - } - l = l->next; - } diff --git a/pidgin-2.5.2-url_fetch_connect_cb-double-free.patch b/pidgin-2.5.2-url_fetch_connect_cb-double-free.patch deleted file mode 100644 index 1b7c122..0000000 --- a/pidgin-2.5.2-url_fetch_connect_cb-double-free.patch +++ /dev/null @@ -1,35 +0,0 @@ -http://developer.pidgin.im/viewmtn/revision/info/27f7d38af8dba617aba8109d82e27907cd7d8b41 -Trigger url_fetch_connect_cb() asynchronously when the connection fails -immediately instead of synchronously calling the callback and then returning -NULL, causing a double free. -Fixes #7278 - -diff -urN pidgin-2.5.2.orig/libpurple/util.c pidgin-2.5.2/libpurple/util.c ---- pidgin-2.5.2.orig/libpurple/util.c 2008-09-23 12:34:05.000000000 -0400 -+++ pidgin-2.5.2/libpurple/util.c 2008-11-21 14:42:09.000000000 -0500 -@@ -3979,6 +3979,13 @@ - callback, user_data); - } - -+static gboolean -+url_fetch_connect_failed(gpointer data) -+{ -+ url_fetch_connect_cb(data, -1, ""); -+ return FALSE; -+} -+ - PurpleUtilFetchUrlData * - purple_util_fetch_url_request_len(const char *url, gboolean full, - const char *user_agent, gboolean http11, -@@ -4016,9 +4023,8 @@ - - if (gfud->connect_data == NULL) - { -- purple_util_fetch_url_error(gfud, _("Unable to connect to %s"), -- gfud->website.address); -- return NULL; -+ /* Trigger the connect_cb asynchronously. */ -+ purple_timeout_add(10, url_fetch_connect_failed, gfud); - } - - return gfud; diff --git a/pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch b/pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch new file mode 100644 index 0000000..ccc81ed --- /dev/null +++ b/pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch @@ -0,0 +1,39 @@ +This forces resolv.conf to be re-read every time a connection is made instead of only if NetworkManager establishes a new connection. +This prevents some error cases for roving clients, especially if they do not use NetworkManager. + +diff -urN pidgin-2.5.3.orig/libpurple/connection.c pidgin-2.5.3/libpurple/connection.c +--- pidgin-2.5.3.orig/libpurple/connection.c 2008-12-20 19:38:16.000000000 -0500 ++++ pidgin-2.5.3/libpurple/connection.c 2008-12-26 16:55:32.000000000 -0500 +@@ -42,6 +42,10 @@ + + #define KEEPALIVE_INTERVAL 30 + ++#include ++#include ++#include ++ + static GList *connections = NULL; + static GList *connections_connecting = NULL; + static PurpleConnectionUiOps *connection_ui_ops = NULL; +@@ -161,6 +165,9 @@ + + purple_signal_emit(purple_connections_get_handle(), "signing-on", gc); + ++ /* Re-read resolv.conf and friends in case DNS servers have changed */ ++ res_init(); ++ + if (regist) + { + purple_debug_info("connection", "Registering. gc = %p\n", gc); +diff -urN pidgin-2.5.3.orig/libpurple/network.c pidgin-2.5.3/libpurple/network.c +--- pidgin-2.5.3.orig/libpurple/network.c 2008-12-20 19:38:16.000000000 -0500 ++++ pidgin-2.5.3/libpurple/network.c 2008-12-26 16:55:32.000000000 -0500 +@@ -633,8 +633,6 @@ + switch(state) + { + case NM_STATE_CONNECTED: +- /* Call res_init in case DNS servers have changed */ +- res_init(); + if (ui_ops != NULL && ui_ops->network_connected != NULL) + ui_ops->network_connected(); + break; diff --git a/pidgin.spec b/pidgin.spec index cacc6a4..18a15a4 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -55,14 +55,14 @@ %define perl_devel_separated 1 %endif # F8+: Perl embed separated out, generate pidgin API documentation -%if 0%{?fedora} >= 6 +%if 0%{?fedora} >= 8 %define perl_embed_separated 1 %define api_docs 1 %endif Name: pidgin -Version: 2.5.2 -Release: 6%{?dist} +Version: 2.5.3 +Release: 1%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls # GPLv2 - silc & novell prpls @@ -92,19 +92,10 @@ Source1: purple-fedora-prefs.xml ## Patches 0-99: Fedora specific or upstream wont accept -Patch0: pidgin-2.4.2-reread-resolvconf.patch +Patch0: pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch Patch1: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch ## Patches 100+: To be Included in Future Upstream -Patch100: pidgin-2.5.2-sametime-redirect-null.patch -Patch101: pidgin-2.5.2-NetworkManager-improvement.patch -Patch102: pidgin-2.5.2-no-password-in-dialog-if-not-remembering.patch -Patch103: pidgin-2.5.2-temporarily-remember-password-during-auto-reconnect.patch -Patch104: pidgin-2.5.2-smilie-theme-change-crash.patch -Patch105: pidgin-2.5.2-url_fetch_connect_cb-double-free.patch -Patch106: pidgin-2.5.2-GtkIMHtmlSmileys-remove-crash.patch -Patch107: pidgin-2.5.2-remove-dialog-from-open-dialog-list.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-root Summary: A Gtk+ based multiprotocol instant messaging client @@ -344,14 +335,6 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}" %endif ## Patches 100+: To be Included in Future Upstream -%patch100 -p1 -b sametime-redirect-null -%patch101 -p1 -b NetworkManager-improvement -%patch102 -p1 -b no-password-in-dialog-if-not-remembering -%patch103 -p1 -b temporarily-remember-password-during-auto-reconnect -%patch104 -p1 -b smilie-theme-change-crash -%patch105 -p1 -b url_fetch_connect_cb-double-free -%patch106 -p1 -b GtkIMHtmlSmileys-remove-crash -%patch107 -p1 -b remove-dialog-from-open-dialog-list # Our preferences cp %{SOURCE1} prefs.xml @@ -578,6 +561,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Dec 26 2008 Warren Togami 2.5.3-1 +- 2.5.3 + * Sat Nov 22 2008 Warren Togami 2.5.2-6 - Automatically detect booleans to enable build features from dist tag - Unify RHEL4 and RHEL5 spec with Fedora to make both easier to maintain diff --git a/sources b/sources index 434bae7..a4e0378 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a712f6fd3d2e25c07ccff1fc350c6ea pidgin-2.5.2.tar.bz2 +4abc4ce9e1ad62bbf098f05f305147d7 pidgin-2.5.3.tar.bz2