rpms/pidgin/FC-6 pidgin-2.0.1-early-g_thread_init.patch, NONE, 1.1 pidgin-2.0.1-gevolution-fix.patch, NONE, 1.1 pidgin-2.0.1-purple-remote-oscar.patch, NONE, 1.1 pidgin-2.0.1-purple-remote-syntax.patch, NONE, 1.1 pidgin.spec, 1.15, 1.16

Thu Jun 14 00:24:15 UTC 2007

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28362

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.0.1-early-g_thread_init.patch 
	pidgin-2.0.1-gevolution-fix.patch 
	pidgin-2.0.1-purple-remote-oscar.patch 
	pidgin-2.0.1-purple-remote-syntax.patch 
Log Message:
* Wed Jun 6 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.1-5
- Enable Bonjour support (#242949)
- Fix building against latest evolution-data-server

* Tue Jun 5 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.1-4
- Fix purple-remote for AIM & ICQ accounts (#240589)
- Add missing Requires to -devel packages
- Add missing BuildRequires for libxml2-devel

* 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)



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-gevolution-fix.patch:

--- NEW FILE pidgin-2.0.1-gevolution-fix.patch ---
-----------------------------------------------------------------
Revision: a825e87da2ebbdbfb6607c333cbac975d1f8a9d1
Ancestor: e3c8bffcba0e661f54f3be0a71a868b62aeee0fb
Author: nosnilmot at pidgin.im
Date: 2007-06-06T19:28:25
Branch: im.pidgin.pidgin

Modified files:
        pidgin/plugins/gevolution/gevolution.c

ChangeLog: 

don't #include <libebook/e-book-listener.h>, it is apparently an
implementation detail and not part of the libebook API, so we should not
be including it (and it is not installed in recent e-d-s)

============================================================
--- pidgin/plugins/gevolution/gevolution.c	a1a4fffe59cac8aef2723a51c1e663c2e1188731
+++ pidgin/plugins/gevolution/gevolution.c	9c184a8354b352418a5b5c4abee78e5d92a5e1d5
@@ -38,7 +38,6 @@
 
 #include <libedata-book/Evolution-DataServer-Addressbook.h>
 
-#include <libebook/e-book-listener.h>
 #include <libedata-book/e-data-book-factory.h>
 #include <bonobo/bonobo-main.h>
 

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

--- NEW FILE pidgin-2.0.1-purple-remote-oscar.patch ---
-----------------------------------------------------------------
Revision: a0ccd8708935303973ab94ba534dabdc72002039
Ancestor: b9db139bf548b0ec1e2265131772e2eb763cfa5a
Author: markdoliner at pidgin.im
Date: 2007-06-04T05:56:16
Branch: im.pidgin.pidgin

Modified files:
        libpurple/purple-remote

ChangeLog: 

Fix http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240589

"If you run "gaim-remote aim:goim?screenname=whatever" then it throws an
exception because it looks for a "prpl-oscar" account, but apparently I am
signed in with a "prpl-aim" account."

============================================================
--- libpurple/purple-remote	3d893ee565001dfffefae1f2d2c28d167530a14a
+++ libpurple/purple-remote	da0715a989b96d9f4840c7ab2917bccb76112413
@@ -31,7 +31,7 @@ def show_help():
         return result
             
 def show_help():
-    print """This program uses DBus to communicate with purple.
+    print """This program uses D-Bus to communicate with purple.
 
 Usage:
 
@@ -96,8 +96,6 @@ def execute(uri):
     protocol = match.group(2)
     if protocol == "xmpp":
         protocol = "jabber"
-    if protocol == "aim" or protocol == "icq":
-        protocol = "oscar"
     if protocol is not None:
         protocol = "prpl-" + protocol
     command = match.group(5)

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/FC-6/pidgin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pidgin.spec	29 May 2007 01:52:18 -0000	1.15
+++ pidgin.spec	14 Jun 2007 00:23:40 -0000	1.16
@@ -20,14 +20,16 @@
 %define modular_x               1
 # OPTION: dbus-glib split (FC6+)
 %define dbus_glib_splt		1
-# OPTION: Meanwhile integration (F7+ & FE6)
+# OPTION: Bonjour support (FC6+)
+%define bonjour_support		1
+# OPTION: Meanwhile integration (FC6+)
 %define meanwhile_integration	1
 # OPTION: Perl devel separated out (F7+)
 %define perl_devel_separated    0
 
 Name:		pidgin
 Version:	2.0.1
-Release:	1%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://pidgin.im/
@@ -53,6 +55,10 @@
 ## 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
+Patch102: pidgin-2.0.1-purple-remote-oscar.patch
+Patch103: pidgin-2.0.1-gevolution-fix.patch
 Patch113: pidgin-2.0.0-beta7-reread-resolvconf.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -81,6 +87,7 @@
 BuildRequires:  ncurses-devel
 BuildRequires:  tcl-devel
 BuildRequires:  tk-devel
+BuildRequires:  libxml2-devel
 
 # krb5 needed for Zephyr (FC1+)
 %if %{krb_integration}
@@ -129,6 +136,9 @@
 %if %{dbus_glib_splt}
 BuildRequires:  dbus-glib-devel >= 0.70
 %endif
+%if %{bonjour_support}
+BuildRequires:	avahi-compat-howl-devel
+%endif
 # Meanwhile integration (F7+)
 %if %{meanwhile_integration}
 BuildRequires:	meanwhile-devel
@@ -160,6 +170,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: libpurple-devel = %{version}-%{release}
 Requires: pkgconfig
+Requires: gtk2-devel
 Obsoletes: gaim-devel
 Provides:  gaim-devel
 
@@ -205,6 +216,12 @@
 Group:      Applications/Internet
 Requires:   libpurple = %{version}-%{release}
 Requires:   pkgconfig
+%if %{dbus_integration}
+Requires:   dbus-devel >= 0.60
+%endif
+%if %{dbus_glib_splt}
+Requires:   dbus-glib-devel >= 0.70
+%endif
 
 %description -n libpurple-devel
 The libpurple-devel package contains the header files, developer
@@ -251,6 +268,7 @@
 Requires:   finch = %{version}-%{release}
 Requires:   libpurple-devel = %{version}-%{release}
 Requires:   pkgconfig
+Requires:   ncurses-devel
 
 %description -n finch-devel
 The finch-devel package contains the header files, developer
@@ -264,6 +282,10 @@
 ## Patches 0-99: Fedora specific or upstream wont accept
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p0
+%patch101 -p0
+%patch102 -p0
+%patch103 -p0
 %patch113 -p1
 
 # Relabel internal version for support purposes
@@ -475,6 +497,19 @@
 
 
 %changelog
+* Wed Jun 6 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.1-5
+- Enable Bonjour support (#242949)
+- Fix building against latest evolution-data-server
+
+* Tue Jun 5 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.1-4
+- Fix purple-remote for AIM & ICQ accounts (#240589)
+- Add missing Requires to -devel packages
+- Add missing BuildRequires for libxml2-devel
+
+* 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
 


