rpms/pidgin/devel pidgin-2.0.1-early-g_thread_init.patch, NONE, 1.1 pidgin-2.0.1-purple-remote-syntax.patch, NONE, 1.1 pidgin.spec, 1.16, 1.17

[Stu Tomlinson (nosnilmot)]

Author: nosnilmot

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

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.0.1-early-g_thread_init.patch 
	pidgin-2.0.1-purple-remote-syntax.patch 
Log Message:
- Call g_thread_init early (#241883)
- Fix purple-remote syntax error (#241905)



pidgin-2.0.1-early-g_thread_init.patch:

--- NEW FILE pidgin-2.0.1-early-g_thread_init.patch ---
-----------------------------------------------------------------
Revision: c2025c2fd1fcbae580c830d05a4945eaa5192bd9
Ancestor: 3ac5981b26be545a8c546e09b6689c2359fad1bb
Author: seanegan at pidgin.im
Date: 2007-05-31T18:28:05
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkmain.c

ChangeLog: 

disapproval of revision '3ac5981b26be545a8c546e09b6689c2359fad1bb'
============================================================
--- pidgin/gtkmain.c	1c97b5231a67719acc6961daa403dd9c610d0dc5
+++ pidgin/gtkmain.c	7f38e60c398ef61579c4256a14ae2071037bdef1
@@ -473,6 +473,9 @@ int main(int argc, char *argv[])
 #else
 	debug_enabled = FALSE;
 #endif
+
+	/* This is the first Glib function call. Make sure to initialize GThread bfeore then */
+	g_thread_init(NULL);
 	
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, LOCALEDIR);

pidgin-2.0.1-purple-remote-syntax.patch:

--- NEW FILE pidgin-2.0.1-purple-remote-syntax.patch ---
-----------------------------------------------------------------
Revision: 211671c8fe491b3dad82b2990c1ffc8e20de8ec4
Ancestor: 371fb91ec4fdb33fa482efe55111fe58d8758c3b
Author: elb at pidgin.im
Date: 2007-05-26T16:05:47
Branch: im.pidgin.pidgin

Modified files:
        libpurple/purple-remote

ChangeLog: 

A conditional in purple_remote was missing a trailing colon.

Fixes #1300

============================================================
--- libpurple/purple-remote	5be48713f1232a7e6f80df7af3a1b3478af5faf0
+++ libpurple/purple-remote	3d893ee565001dfffefae1f2d2c28d167530a14a
@@ -94,7 +94,7 @@ def execute(uri):
 def execute(uri):
     match = re.match(urlregexp, uri)
     protocol = match.group(2)
-    if protocol == "xmpp"
+    if protocol == "xmpp":
         protocol = "jabber"
     if protocol == "aim" or protocol == "icq":
         protocol = "oscar"


Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pidgin.spec	29 May 2007 01:03:09 -0000	1.16
+++ pidgin.spec	3 Jun 2007 16:29:58 -0000	1.17
@@ -27,7 +27,7 @@
 
 Name:		pidgin
 Version:	2.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://pidgin.im/
@@ -53,6 +53,8 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 
 ## Patches 100+: To be Included in Future Upstream
+Patch100: pidgin-2.0.1-early-g_thread_init.patch
+Patch101: pidgin-2.0.1-purple-remote-syntax.patch
 Patch113: pidgin-2.0.0-beta7-reread-resolvconf.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -264,6 +266,8 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p0
+%patch101 -p0
 %patch113 -p1
 
 # Relabel internal version for support purposes
@@ -475,6 +479,10 @@
 
 
 %changelog
+* Fri May 31 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.1-2
+- Call g_thread_init early (#241883)
+- Fix purple-remote syntax error (#241905)
+
 * Mon May 28 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.1-1
 - 2.0.1