From abc1aaa959b6994c77f9f10b897104cdcad7968c Mon Sep 17 00:00:00 2001
From: Peter Gordon <pgordon@fedoraproject.org>
Date: Jan 16 2008 07:17:17 +0000
Subject: Update to 4.55


---

diff --git a/.cvsignore b/.cvsignore
index 8080534..b55973c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-telepathy-mission-control-4.51.tar.gz
+telepathy-mission-control-4.55.tar.gz
diff --git a/sources b/sources
index 9a41a5b..0030b5f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ca18503a7a64ddedf735659820142bf  telepathy-mission-control-4.51.tar.gz
+83d8b7c3bc41ab0cd6280fbbf192fb53  telepathy-mission-control-4.55.tar.gz
diff --git a/telepathy-mission-control-size_t_vs_guint.patch b/telepathy-mission-control-size_t_vs_guint.patch
deleted file mode 100644
index 2f95372..0000000
--- a/telepathy-mission-control-size_t_vs_guint.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: src/mcd-connection.c
-===================================================================
---- src/mcd-connection.c	(revision 40)
-+++ src/mcd-connection.c	(working copy)
-@@ -774,7 +774,6 @@
- _mcd_connection_setup_avatar (McdConnectionPrivate *priv)
- {
-     gchar *filename, *mime_type, *token;
--    GArray *avatar;
-     GError *error = NULL;
- 
-     priv->avatars_proxy = tp_conn_get_interface (priv->tp_conn,
-@@ -794,14 +793,19 @@
-     /* if the token is set, we have nothing to do */
-     if (!token && filename && g_file_test (filename, G_FILE_TEST_EXISTS))
-     {
--	avatar = g_array_new (FALSE, FALSE, 1);
--	g_return_if_fail (avatar != NULL);
--	if (g_file_get_contents (filename, &avatar->data, &avatar->len, &error))
-+	gchar *data = NULL;
-+	size_t length;
-+	if (g_file_get_contents (filename, &data, &length, &error))
- 	{
--	    if (avatar->len > 0)
-+	    if (length > 0 && length < G_MAXUINT) 
-+	    {
-+		GArray avatar;
-+		avatar.data = data;
-+		avatar.len = (guint)length;
- 		tp_conn_iface_avatars_set_avatar_async (priv->avatars_proxy,
--						       	avatar, mime_type,
-+						       	&avatar, mime_type,
- 						       	set_avatar_cb, priv);
-+	    }
- 	    else
- 		tp_conn_iface_avatars_clear_avatar_async(priv->avatars_proxy,
- 							 clear_avatar_cb,
-@@ -813,7 +817,7 @@
- 	    g_debug ("%s: error reading %s: %s", G_STRFUNC, filename, error->message);
- 	    g_error_free (error);
- 	}
--	g_array_free (avatar, TRUE);
-+	g_free(data);
-     }
-     
-     g_free (filename);
diff --git a/telepathy-mission-control.spec b/telepathy-mission-control.spec
index b176e2a..d3c35d9 100644
--- a/telepathy-mission-control.spec
+++ b/telepathy-mission-control.spec
@@ -1,5 +1,5 @@
 Name:           telepathy-mission-control
-Version:        4.51
+Version:        4.55
 Release:        1%{?dist}
 Summary:        Central control for Telepathy connection manager
 
@@ -7,8 +7,6 @@ Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://mission-control.sourceforge.net/
 Source0:        http://prdownloads.sourceforge.net/mission-control/%{name}-%{version}.tar.gz
-#fix build on x86_64
-#Patch0:         telepathy-mission-control-size_t_vs_guint.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtelepathy-devel, libxslt-devel, GConf2-devel 
@@ -65,6 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/mission-control/profiles
 %{_libdir}/*.so.*
 %{_datadir}/dbus-1/services/*.service
+%{_libexecdir}/mission-control
 
 %files devel
 %defattr(-,root,root,-)
@@ -76,6 +75,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jan 15 2008 Peter Gordon <peter@thecodergeek.com> - 4.55-1
+- Update to new upstream release (4.55)
+- Drop obsolete 64-bit patch.
+  - size_t_vs_guint.patch
+
 * Sat Dec 15 2007 Peter Gordon <peter@thecodergeek.com> - 4.51-1
 - Update to new upstream release (4.51)