rpms/pidgin/devel pidgin-2.4.2-reread-resolvconf.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 pidgin.spec, 1.52, 1.53 sources, 1.15, 1.16 pidgin-2.0.0-beta7-reread-resolvconf.patch, 1.1, NONE

[Stu Tomlinson (nosnilmot)]

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2516/devel

Modified Files:
	.cvsignore pidgin.spec sources 
Added Files:
	pidgin-2.4.2-reread-resolvconf.patch 
Removed Files:
	pidgin-2.0.0-beta7-reread-resolvconf.patch 
Log Message:
New upstream release 2.4.2


pidgin-2.4.2-reread-resolvconf.patch:

--- NEW FILE pidgin-2.4.2-reread-resolvconf.patch ---
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 <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
 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;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	31 Mar 2008 21:38:36 -0000	1.15
+++ .cvsignore	17 May 2008 14:55:32 -0000	1.16
@@ -1 +1 @@
-pidgin-2.4.1.tar.bz2
+pidgin-2.4.2.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- pidgin.spec	13 May 2008 17:12:18 -0000	1.52
+++ pidgin.spec	17 May 2008 14:55:32 -0000	1.53
@@ -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 @@
 
 
 ## 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 @@
 %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 @@
 %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 @@
 
 
 %changelog
+* Sat May 17 2008 Stu Tomlinson <stu at nosnilmot.com> 2.4.2-1
+- 2.4.2
+
 * Tue May 13 2008 Stu Tomlinson <stu at nosnilmot.com> 2.4.1-3
 - Rebuild for new evolution-data-server
 - Clean up default prefs.xml


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	31 Mar 2008 21:38:36 -0000	1.15
+++ sources	17 May 2008 14:55:32 -0000	1.16
@@ -1 +1 @@
-ff015bb8bbdcc6a9b4ac954c355179d7  pidgin-2.4.1.tar.bz2
+2d10f9b6a5f0162cf88016ea2ca0a36d  pidgin-2.4.2.tar.bz2


--- pidgin-2.0.0-beta7-reread-resolvconf.patch DELETED ---