diff --git a/.cvsignore b/.cvsignore index 704f81a..b294afc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -empathy-2.29.4.tar.bz2 +empathy-2.29.5.1.tar.bz2 diff --git a/empathy.spec b/empathy.spec index 5431868..6cd80dc 100644 --- a/empathy.spec +++ b/empathy.spec @@ -2,7 +2,7 @@ %global gtk2_min_version 2.18 %global glib2_min_version 2.22.0 %global tp_mc_min_version 5.0.0 -%global tp_glib_min_version 0.9.0 +%global tp_glib_min_version 0.9.2 %global enchant_version 1.2.0 %global network_manager_version 0.7.0 %global libcanberra_version 0.4 @@ -11,7 +11,7 @@ %global libchamplain_version 0.4 Name: empathy -Version: 2.29.4 +Version: 2.29.5.1 Release: 1%{?dist} Summary: Instant Messaging Client for GNOME @@ -168,6 +168,9 @@ fi %{_mandir}/man1/empathy*.1.gz %changelog +* Tue Jan 12 2010 Brian Pepple - 2.29.5.1-1 +- Update to 2.29.5.1. + * Mon Dec 21 2009 Brian Pepple - 2.29.4-1 - Update to 2.29.4. diff --git a/presence-icons.patch b/presence-icons.patch index 19ee4e9..b201fa4 100644 --- a/presence-icons.patch +++ b/presence-icons.patch @@ -1,12 +1,12 @@ -diff -urp empathy-2.29.2.orig/libempathy-gtk/empathy-presence-chooser.c empathy-2.29.2/libempathy-gtk/empathy-presence-chooser.c ---- empathy-2.29.2.orig/libempathy-gtk/empathy-presence-chooser.c 2009-11-13 11:03:46.000000000 -0500 -+++ empathy-2.29.2/libempathy-gtk/empathy-presence-chooser.c 2009-11-16 18:05:16.058911858 -0500 -@@ -228,7 +228,7 @@ presence_chooser_create_model (EmpathyPr +diff -urp empathy-2.29.5.OLD/libempathy-gtk/empathy-presence-chooser.c empathy-2.29.5/libempathy-gtk/empathy-presence-chooser.c +--- empathy-2.29.5.OLD/libempathy-gtk/empathy-presence-chooser.c 2010-01-11 11:54:53.000000000 -0500 ++++ empathy-2.29.5/libempathy-gtk/empathy-presence-chooser.c 2010-01-11 17:33:09.922909891 -0500 +@@ -218,7 +218,7 @@ presence_chooser_create_model (EmpathyPr gtk_list_store_insert_with_values (store, NULL, -1, - COL_STATUS_TEXT, _("Edit Custom Messages..."), + COL_STATUS_TEXT, _("Edit Custom Messages…"), - COL_STATE_ICON_NAME, GTK_STOCK_EDIT, + COL_STATE_ICON_NAME, NULL, - COL_DISPLAY_MARKUP, _("Edit Custom Messages..."), + COL_DISPLAY_MARKUP, _("Edit Custom Messages…"), COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM, -1); diff --git a/sources b/sources index 4639b1b..9af6da1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -561b5b08f12245f26fa5c1318f739dcc empathy-2.29.4.tar.bz2 +abb9ec97b084ae451c4e93af142ff8a0 empathy-2.29.5.1.tar.bz2