rpms/telepathy-haze/F-7 telepathy-haze-glib2.12-fix.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 telepathy-haze.spec, 1.1, 1.2

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/pkgs/rpms/telepathy-haze/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8013

Modified Files:
	.cvsignore sources telepathy-haze.spec 
Added Files:
	telepathy-haze-glib2.12-fix.patch 
Log Message:
Update to 0.1.3; add upstream patch to build/run properly with GLib 2.12

telepathy-haze-glib2.12-fix.patch:

--- NEW FILE telepathy-haze-glib2.12-fix.patch ---
Index: ./src/connection-manager.c
===================================================================
Thu Nov 15 12:01:54 GMT 2007  Will Thompson <will.thompson at collabora.co.uk>
  * Reimplement g_hash_table_get_values so that haze builds with glib < 2.14.
--- old-telepathy-haze.resiak/src/connection-manager.c	2007-11-15 12:06:56.000000000 +0000
+++ new-telepathy-haze.resiak/src/connection-manager.c	2007-11-15 12:06:56.000000000 +0000
@@ -205,6 +205,26 @@
     return (!strcmp (info->prpl_id, prpl_id));
 }
 
+static void
+get_values_foreach(gpointer key,
+                   gpointer value,
+                   gpointer data)
+{
+    GList **values = data;
+    *values = g_list_prepend(*values, value);
+}
+
+/* Equivalent to g_hash_table_get_values, which only exists in GLib >=2.14. */
+static GList *
+haze_g_hash_table_get_values (GHashTable *table)
+{
+    GList *values = NULL;
+
+    g_hash_table_foreach(table, get_values_foreach, &values);
+
+    return values;
+}
+
 static void _init_protocol_table (HazeConnectionManagerClass *klass)
 {
     GHashTable *table;
@@ -256,7 +276,7 @@
     }
 
     {
-        GList *protocols = g_hash_table_get_values (table);
+        GList *protocols = haze_g_hash_table_get_values (table);
         GList *l;
         GString *debug_string = g_string_new ("");
 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Nov 2007 19:25:59 -0000	1.2
+++ .cvsignore	15 Nov 2007 18:16:24 -0000	1.3
@@ -1 +1 @@
-telepathy-haze-0.1.2.tar.gz
+telepathy-haze-0.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Nov 2007 19:25:59 -0000	1.2
+++ sources	15 Nov 2007 18:16:24 -0000	1.3
@@ -1 +1 @@
-50d1385b43ce6f8909c5d5e311c982ce  telepathy-haze-0.1.2.tar.gz
+4567bc642f3c4371af42befea81592f1  telepathy-haze-0.1.3.tar.gz


Index: telepathy-haze.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/F-7/telepathy-haze.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- telepathy-haze.spec	12 Nov 2007 19:25:59 -0000	1.1
+++ telepathy-haze.spec	15 Nov 2007 18:16:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		telepathy-haze
-Version:	0.1.2
-Release:	3%{?dist}
+Version:	0.1.3
+Release:	1%{?dist}
 Summary:	A multi-protocol Libpurple connection manager for Telepathy
 
 Group:		Applications/Communications
@@ -12,6 +12,8 @@
 Source1:	haze-aim.profile
 Source2:	haze-msn.profile
 
+Patch0: 	%{name}-glib2.12-fix.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libpurple-devel
@@ -46,6 +48,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -70,9 +73,10 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING NEWS
-%{_bindir}/telepathy-haze
+%{_libexecdir}/telepathy-haze
 %{_datadir}/dbus-1/services/*.haze.service
 %{_datadir}/telepathy/managers/haze.manager
+%{_mandir}/man8/telepathy-haze.8*
 
 %files	mission-control
 %defattr(-,root,root,-)
@@ -82,6 +86,13 @@
 
 
 %changelog
+* Wed Nov 14 2007 Peter Gordon <peter at thecodergeek.com> - 0.1.3-1
+- Update to new upstream release (0.1.3), which fixes the accidental
+  ~/.purple directory deletion with Pidgin 2.3.0+ (among other notable fixes
+  and enhancements).
+- Add a patch from upstream to fix building against GLib 2.12:
+  + glib2.12-fix.patch
+
 * Sun Nov 11 2007 Peter Gordon <peter at thecodergeek.com> - 0.1.2-3
 - Fix Source0 URL.