rpms/pidgin/F-7 pidgin-2.4.2-reread-resolvconf.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 pidgin.spec, 1.33, 1.34 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/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2516/F-7

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/F-7/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	31 Mar 2008 21:37:50 -0000	1.15
+++ .cvsignore	17 May 2008 14:54:46 -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/F-7/pidgin.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- pidgin.spec	31 Mar 2008 21:37:50 -0000	1.33
+++ pidgin.spec	17 May 2008 14:54:46 -0000	1.34
@@ -25,10 +25,10 @@
 # OPTION: Perl devel separated out (F7+)
 %define perl_devel_separated    1
 # OPTION: Perl embed separated out (F9+)
-%define perl_embed_separated	0
+%define perl_embed_separated	1
 
 Name:		pidgin
-Version:	2.4.1
+Version:	2.4.2
 Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
@@ -41,8 +41,11 @@
 Provides:       gaim = 999:1
 ExcludeArch:    s390 s390x
 
-## Fedora pidgin defaults - Please Regenerate for Each Major Release
-# 1) run pidgin as new user 2) edit preferences 3) close 4) copy .purple/prefs.xml
+## Fedora pidgin defaults
+# Only needs regenerating if Pidgin breaks backwards compatibility with prefs.xml
+# 1) uninstall any non-default pidgin or libpurple plugins
+# 2) run pidgin as new user 3) edit preferences 4) close 5) copy .purple/prefs.xml
+# OR 1) edit manually
 # - enable ExtPlacement plugin
 # - enable History plugin
 # - enable Message Notification plugin
@@ -56,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
 
@@ -80,7 +83,7 @@
 BuildRequires:  autoconf
 BuildRequires:	startup-notification-devel
 BuildRequires:  cyrus-sasl-devel
-BuildRequires:	mozilla-nss-devel
+BuildRequires:	nss-devel
 BuildRequires:	gtk2-devel
 BuildRequires:  gettext
 BuildRequires:  intltool
@@ -237,6 +240,7 @@
 Summary:    Perl scripting support for libpurple
 Group:      Applications/Internet
 Requires:   libpurple = %{version}-%{release}
+Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description -n libpurple-perl
 Perl plugin loader for libpurple. This package will allow you to write or
@@ -284,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
 
@@ -305,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
@@ -492,9 +501,23 @@
 
 
 %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
+- Enable nautilus integration plugin by default in prefs.xml (#242289)
+
+* Mon Mar 31 2008 Stu Tomlinson <stu at nosnilmot.com> 2.4.1-2
+- nss-devel no longer provides mozilla-nss-devel
+
 * Mon Mar 31 2008 Stu Tomlinson <stu at nosnilmot.com> 2.4.1-1
 - 2.4.1
 
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-4
+- add Requires for versioned perl (libperl.so)
+
 * Fri Mar 14 2008 Stu Tomlinson <stu at nosnilmot.com> 2.4.0-3
 - BuildRequire perl(ExtUtils::Embed) for perl 5.10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	31 Mar 2008 21:37:50 -0000	1.15
+++ sources	17 May 2008 14:54:46 -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 ---