From 6d9a83228ff581f1b4779b302cb10eb78a858f0d Mon Sep 17 00:00:00 2001 From: Stu Tomlinson Date: May 17 2008 14:55:32 +0000 Subject: New upstream release 2.4.2 --- diff --git a/.cvsignore b/.cvsignore index f291bc2..2ba55ca 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pidgin-2.4.1.tar.bz2 +pidgin-2.4.2.tar.bz2 diff --git a/pidgin-2.0.0-beta7-reread-resolvconf.patch b/pidgin-2.0.0-beta7-reread-resolvconf.patch deleted file mode 100644 index 9f06d51..0000000 --- a/pidgin-2.0.0-beta7-reread-resolvconf.patch +++ /dev/null @@ -1,45 +0,0 @@ -http://sourceforge.net/tracker/index.php?func=detail&aid=1604261&group_id=235&atid=300235 -If the network connection on a machine is changed while gaim is running, it -won't pick up the changes unless NetworkManager support is enabled. This -makes it always re-read the DNS info before a server connect. - -This implemention is considered to be disliked because it re-reads the config files a few times -upon every connection. There appears however to be no work underway to fix it properly. This -behavior is at least harmless while fixing the bug, so we will keep this patch for now. - -diff -urN pidgin-2.0.0beta7devel.orig/libpurple/connection.c pidgin-2.0.0beta7devel/libpurple/connection.c ---- pidgin-2.0.0beta7devel.orig/libpurple/connection.c 2007-03-20 01:59:41.000000000 -0400 -+++ pidgin-2.0.0beta7devel/libpurple/connection.c 2007-04-16 13:54:40.000000000 -0400 -@@ -37,6 +37,10 @@ - #include "signals.h" - #include "util.h" - -+#include -+#include -+#include -+ - static GList *connections = NULL; - static GList *connections_connecting = NULL; - static PurpleConnectionUiOps *connection_ui_ops = NULL; -@@ -139,6 +143,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.0.0beta7devel.orig/libpurple/network.c pidgin-2.0.0beta7devel/libpurple/network.c ---- pidgin-2.0.0beta7devel.orig/libpurple/network.c 2007-04-01 11:51:46.000000000 -0400 -+++ pidgin-2.0.0beta7devel/libpurple/network.c 2007-04-16 13:55:08.000000000 -0400 -@@ -612,8 +612,6 @@ - switch(current) - { - case LIBNM_ACTIVE_NETWORK_CONNECTION: -- /* 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 = current; diff --git a/pidgin-2.4.2-reread-resolvconf.patch b/pidgin-2.4.2-reread-resolvconf.patch new file mode 100644 index 0000000..7f50e18 --- /dev/null +++ b/pidgin-2.4.2-reread-resolvconf.patch @@ -0,0 +1,36 @@ +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.spec b/pidgin.spec index 1bf34ec..0645fc5 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -28,8 +28,8 @@ %define perl_embed_separated 1 Name: pidgin -Version: 2.4.1 -Release: 3%{?dist} +Version: 2.4.2 +Release: 1%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls # GPLv2 - silc & novell prpls @@ -59,7 +59,7 @@ Source1: purple-fedora-prefs.xml ## Patches 0-99: Fedora specific or upstream wont accept -Patch0: pidgin-2.0.0-beta7-reread-resolvconf.patch +Patch0: pidgin-2.4.2-reread-resolvconf.patch ## Patches 100+: To be Included in Future Upstream @@ -288,7 +288,7 @@ and plugins. %prep %setup -q ## Patches 0-99: Fedora specific or upstream wont accept -%patch0 -p1 +%patch0 -p1 -b .resolv ## Patches 100+: To be Included in Future Upstream @@ -309,6 +309,11 @@ SWITCHES="--with-extraversion=%{release}" %else SWITCHES="$SWITCHES --disable-perl" %endif +%if %{evolution_integration} + SWITCHES="$SWITCHES --enable-gevolution" +%else + SWITCHES="$SWITCHES --disable-gevolution" +%endif %if %{dbus_integration} SWITCHES="$SWITCHES --enable-dbus" %else @@ -496,6 +501,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 17 2008 Stu Tomlinson 2.4.2-1 +- 2.4.2 + * Tue May 13 2008 Stu Tomlinson 2.4.1-3 - Rebuild for new evolution-data-server - Clean up default prefs.xml diff --git a/sources b/sources index 199169e..1caf8ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff015bb8bbdcc6a9b4ac954c355179d7 pidgin-2.4.1.tar.bz2 +2d10f9b6a5f0162cf88016ea2ca0a36d pidgin-2.4.2.tar.bz2