[gnome-phone-manager] Rebuild against newer evolution-data-server

[Milan Crha]

commit 243f19f89fd0efab16e6005db4238820792b2745
Author: Milan Crha <mcrha at redhat.com>
Date:   Mon Nov 28 11:53:29 2011 +0100

    Rebuild against newer evolution-data-server

 gnome-phone-manager-0.66-no-g-thread-init.patch |   55 +++++++++++++++++++++++
 gnome-phone-manager.spec                        |    9 +++-
 2 files changed, 63 insertions(+), 1 deletions(-)
---
diff --git a/gnome-phone-manager-0.66-no-g-thread-init.patch b/gnome-phone-manager-0.66-no-g-thread-init.patch
new file mode 100644
index 0000000..4280528
--- /dev/null
+++ b/gnome-phone-manager-0.66-no-g-thread-init.patch
@@ -0,0 +1,55 @@
+diff -up gnome-phone-manager-0.66/libgsm/glibgsmtest.c.no-g-thread-init gnome-phone-manager-0.66/libgsm/glibgsmtest.c
+--- gnome-phone-manager-0.66/libgsm/glibgsmtest.c.no-g-thread-init	2011-11-28 11:48:22.334360025 +0100
++++ gnome-phone-manager-0.66/libgsm/glibgsmtest.c	2011-11-28 11:49:17.081032493 +0100
+@@ -133,12 +133,11 @@ main (int argc, char **argv)
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain (GETTEXT_PACKAGE);
+ 
++	g_type_init ();
++
+ 	context = g_option_context_new ("Manage mobile phone");
+ 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+ 
+-	g_thread_init (NULL);
+-	g_type_init ();
+-
+ 	if (g_option_context_parse (context, &argc, &argv, &err) == FALSE) {
+ 		g_print ("couldn't parse command-line options: %s\n", err->message);
+ 		g_error_free (err);
+diff -up gnome-phone-manager-0.66/src/main.c.no-g-thread-init gnome-phone-manager-0.66/src/main.c
+--- gnome-phone-manager-0.66/src/main.c.no-g-thread-init	2011-11-28 11:48:33.334495138 +0100
++++ gnome-phone-manager-0.66/src/main.c	2011-11-28 11:49:40.296317640 +0100
+@@ -49,7 +49,7 @@ main (int argc, char **argv)
+ 	GOptionContext *context;
+ 	GError *error = NULL;
+ 
+-	g_thread_init (NULL);
++	g_type_init ();
+ 
+ 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+diff -up gnome-phone-manager-0.66/src/test-entry.c.no-g-thread-init gnome-phone-manager-0.66/src/test-entry.c
+--- gnome-phone-manager-0.66/src/test-entry.c.no-g-thread-init	2011-11-28 11:48:46.118652168 +0100
++++ gnome-phone-manager-0.66/src/test-entry.c	2011-11-28 11:49:57.712531557 +0100
+@@ -45,7 +45,7 @@ int main (int argc, char **argv)
+ {
+ 	GtkWidget *window, *entry;
+ 
+-	g_thread_init (NULL);
++	g_type_init ();
+ 
+ 	gtk_init (&argc, &argv);
+ 
+diff -up gnome-phone-manager-0.66/telepathy/main.c.no-g-thread-init gnome-phone-manager-0.66/telepathy/main.c
+--- gnome-phone-manager-0.66/telepathy/main.c.no-g-thread-init	2011-11-28 11:48:08.579191022 +0100
++++ gnome-phone-manager-0.66/telepathy/main.c	2011-11-28 11:50:22.000830141 +0100
+@@ -58,8 +58,8 @@ main(int argc,
+ 	int ret = 0;
+ 	GOptionContext *context;
+ 
++	g_type_init ();
+ 	g_set_prgname("telepathy-phoney");
+-	g_thread_init (NULL);
+ 
+ 	setlocale (LC_ALL, "");
+ 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
diff --git a/gnome-phone-manager.spec b/gnome-phone-manager.spec
index 6283696..24b98f9 100644
--- a/gnome-phone-manager.spec
+++ b/gnome-phone-manager.spec
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.66
-Release: 	7%{?dist}
+Release: 	8%{?dist}
 License: 	GPLv2+
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -21,6 +21,8 @@ BuildRequires:	intltool perl(XML::Parser)
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 
+Patch01: gnome-phone-manager-0.66-no-g-thread-init.patch
+
 %description
 This program will connect to your mobile phone over a serial port,
 either via a cable, infrared (IrDA) or Bluetooth connection.
@@ -42,6 +44,7 @@ Instant Messaging application that uses Telepathy, such as Empathy.
 
 %prep
 %setup -q
+%patch01 -p1 -b .no-g-thread-init
 
 %build
 %configure
@@ -102,6 +105,10 @@ fi
 %{_datadir}/mission-control/profiles/*
 
 %changelog
+* Mon Nov 28 2011 Milan Crha <mcrha at redhat.com> 0.66-8
+- Rebuild against newer evolution-data-server
+- Add patch to drop g_thread_init() calls
+
 * Sun Oct 30 2011 Bruno Wolff III <bruno at wolff.to> - 0.66-7
 - Rebuild against newer evolution-data-server