From 54854ff2ad55d8dab3066ae737876062b52e7af4 Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Aug 26 2009 18:39:49 +0000 Subject: - Update to 2.27.91.1. - Add BR on unique-devel. - Update presence-icons patch. - Add patch to fix invalid category in desktop file. - Drop clutter patch. Fixed upstream. --- diff --git a/.cvsignore b/.cvsignore index bbf7ece..e548919 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -empathy-2.27.5.tar.bz2 +empathy-2.27.91.1.tar.bz2 diff --git a/button-images.patch b/button-images.patch deleted file mode 100644 index 1184052..0000000 --- a/button-images.patch +++ /dev/null @@ -1,229 +0,0 @@ -diff -up empathy-2.27.4/libempathy-gtk/empathy-new-message-dialog.ui.button-images empathy-2.27.4/libempathy-gtk/empathy-new-message-dialog.ui ---- empathy-2.27.4/libempathy-gtk/empathy-new-message-dialog.ui.button-images 2009-07-16 14:39:09.911582772 -0400 -+++ empathy-2.27.4/libempathy-gtk/empathy-new-message-dialog.ui 2009-07-16 14:42:29.660614918 -0400 -@@ -1,6 +1,14 @@ - - - -+ -+ audio-input-microphone -+ 4 -+ -+ -+ im-message-new -+ 4 -+ - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 -@@ -82,41 +90,9 @@ - True - True - True -- -- -- True -- 0 -- 0 -- -- -- True -- 2 -- -- -- True -- audio-input-microphone -- -- -- False -- False -- -- -- -- -- True -- C_all -- True -- -- -- False -- False -- 1 -- -- -- -- -- -- -+ call_image -+ C_all -+ True - - - 1 -@@ -128,41 +104,9 @@ - True - True - True -- -- -- True -- 0 -- 0 -- -- -- True -- 2 -- -- -- True -- im-message-new -- -- -- False -- False -- -- -- -- -- True -- C_hat -- True -- -- -- False -- False -- 1 -- -- -- -- -- -- -+ chat_image -+ C_hat -+ True - - - 2 -diff -up empathy-2.27.4/src/empathy-accounts-dialog.ui.button-images empathy-2.27.4/src/empathy-accounts-dialog.ui ---- empathy-2.27.4/src/empathy-accounts-dialog.ui.button-images 2009-07-16 14:23:32.512361372 -0400 -+++ empathy-2.27.4/src/empathy-accounts-dialog.ui 2009-07-16 14:25:00.288598827 -0400 -@@ -2,6 +2,10 @@ - - - -+ -+ gtk-add -+ 4 -+ - - 5 - Accounts -@@ -56,42 +60,9 @@ - True - True - False -- -- -- True -- 0 -- 0 -- -- -- True -- 2 -- -- -- True -- gtk-add -- -- -- False -- False -- 0 -- -- -- -- -- True -- _Add... -- True -- -- -- False -- False -- 1 -- -- -- -- -- -- -+ add_image -+ _Add... -+ True - - - 0 -diff -up empathy-2.27.4/src/empathy-main-window.ui.button-images empathy-2.27.4/src/empathy-main-window.ui -diff -up empathy-2.27.4/src/empathy-new-chatroom-dialog.ui.button-images empathy-2.27.4/src/empathy-new-chatroom-dialog.ui ---- empathy-2.27.4/src/empathy-new-chatroom-dialog.ui.button-images 2009-07-16 14:20:36.799613393 -0400 -+++ empathy-2.27.4/src/empathy-new-chatroom-dialog.ui 2009-07-16 14:22:06.493333193 -0400 -@@ -2,6 +2,10 @@ - - - -+ -+ gtk-jump-to -+ 4 -+ - - True - 5 -@@ -245,42 +249,9 @@ - True - True - False -- -- -- True -- 0 -- 0 -- -- -- True -- 2 -- -- -- True -- gtk-jump-to -- -- -- False -- False -- 0 -- -- -- -- -- True -- _Join -- True -- -- -- False -- False -- 1 -- -- -- -- -- -- -+ join_image -+ _Join -+ True - - - False diff --git a/clutter.patch b/clutter.patch deleted file mode 100644 index 0446ddf..0000000 --- a/clutter.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -up empathy-2.27.5/configure.ac.clutter empathy-2.27.5/configure.ac ---- empathy-2.27.5/configure.ac.clutter 2009-07-29 07:36:07.000000000 -0400 -+++ empathy-2.27.5/configure.ac 2009-08-03 23:00:02.414627609 -0400 -@@ -259,7 +259,7 @@ if test "x$enable_map" != "xno"; then - [ - champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED, - champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED -- clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED -+ clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED - ], have_libchamplain="yes", have_libchamplain="no") - - if test "x$have_libchamplain" = "xyes"; then -diff -up empathy-2.27.5/configure.clutter empathy-2.27.5/configure ---- empathy-2.27.5/configure.clutter 2009-07-29 07:37:16.000000000 -0400 -+++ empathy-2.27.5/configure 2009-08-03 23:00:02.426622014 -0400 -@@ -18518,12 +18518,12 @@ if test -n "$PKG_CONFIG"; then - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - champlain-0.3 >= \$LIBCHAMPLAIN_REQUIRED, - champlain-gtk-0.3 >= \$LIBCHAMPLAIN_GTK_REQUIRED -- clutter-gtk-0.8 >= \$CLUTTER_GTK_REQUIRED -+ clutter-gtk-0.10 >= \$CLUTTER_GTK_REQUIRED - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED, - champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED -- clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED -+ clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED - ") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -18531,7 +18531,7 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags " - champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED, - champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED -- clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED -+ clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED - " 2>/dev/null` - else - pkg_failed=yes -@@ -18548,12 +18548,12 @@ if test -n "$PKG_CONFIG"; then - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - champlain-0.3 >= \$LIBCHAMPLAIN_REQUIRED, - champlain-gtk-0.3 >= \$LIBCHAMPLAIN_GTK_REQUIRED -- clutter-gtk-0.8 >= \$CLUTTER_GTK_REQUIRED -+ clutter-gtk-0.10 >= \$CLUTTER_GTK_REQUIRED - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED, - champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED -- clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED -+ clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED - ") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -18561,7 +18561,7 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs " - champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED, - champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED -- clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED -+ clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED - " 2>/dev/null` - else - pkg_failed=yes -@@ -18584,13 +18584,13 @@ fi - LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " - champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED, - champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED -- clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED -+ clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED - "` - else - LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " - champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED, - champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED -- clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED -+ clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED - "` - fi - # Put the nasty error message in config.log where it belongs -diff -up empathy-2.27.5/src/empathy.c.clutter empathy-2.27.5/src/empathy.c ---- empathy-2.27.5/src/empathy.c.clutter 2009-08-03 23:15:04.865374891 -0400 -+++ empathy-2.27.5/src/empathy.c 2009-08-03 23:14:03.385652105 -0400 -@@ -32,7 +32,7 @@ - #include - - #if HAVE_LIBCHAMPLAIN --#include -+#include - #endif - - #include -diff -up empathy-2.27.5/src/empathy-map-view.c.clutter empathy-2.27.5/src/empathy-map-view.c ---- empathy-2.27.5/src/empathy-map-view.c.clutter 2009-08-03 23:15:22.429671111 -0400 -+++ empathy-2.27.5/src/empathy-map-view.c 2009-08-03 23:17:08.445626300 -0400 -@@ -26,7 +26,7 @@ - - #include - #include --#include -+#include - #include - - #include -@@ -190,7 +190,7 @@ map_view_contacts_foreach (GtkTreeModel - if (avatar != NULL) - { - texture = clutter_texture_new (); -- gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar); -+ gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar, NULL); - champlain_marker_set_image (CHAMPLAIN_MARKER (marker), texture); - g_object_unref (avatar); - } diff --git a/empathy-desktop-category.patch b/empathy-desktop-category.patch new file mode 100644 index 0000000..2d04665 --- /dev/null +++ b/empathy-desktop-category.patch @@ -0,0 +1,36 @@ +diff -urp empathy-2.27.91.1.OLD/data/empathy.desktop empathy-2.27.91.1/data/empathy.desktop +--- empathy-2.27.91.1.OLD/data/empathy.desktop 2009-08-25 11:59:12.000000000 -0400 ++++ empathy-2.27.91.1/data/empathy.desktop 2009-08-26 14:02:09.405801422 -0400 +@@ -44,7 +44,7 @@ Icon=empathy + StartupNotify=false + Terminal=false + Type=Application +-Categories=GNOME;GTK;Network;IM; ++Categories=GNOME;GTK;Network;InstantMessaging; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=empathy + X-GNOME-Bugzilla-Component=General +diff -urp empathy-2.27.91.1.OLD/data/empathy.desktop.in empathy-2.27.91.1/data/empathy.desktop.in +--- empathy-2.27.91.1.OLD/data/empathy.desktop.in 2009-08-25 11:58:25.000000000 -0400 ++++ empathy-2.27.91.1/data/empathy.desktop.in 2009-08-26 14:01:54.399801188 -0400 +@@ -7,7 +7,7 @@ Icon=empathy + StartupNotify=false + Terminal=false + Type=Application +-Categories=GNOME;GTK;Network;IM; ++Categories=GNOME;GTK;Network;InstantMessaging; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=empathy + X-GNOME-Bugzilla-Component=General +diff -urp empathy-2.27.91.1.OLD/data/empathy.desktop.in.in empathy-2.27.91.1/data/empathy.desktop.in.in +--- empathy-2.27.91.1.OLD/data/empathy.desktop.in.in 2009-08-21 09:24:55.000000000 -0400 ++++ empathy-2.27.91.1/data/empathy.desktop.in.in 2009-08-26 14:01:41.363551729 -0400 +@@ -7,7 +7,7 @@ Icon=empathy + StartupNotify=false + Terminal=false + Type=Application +-Categories=GNOME;GTK;Network;IM; ++Categories=GNOME;GTK;Network;InstantMessaging; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=empathy + X-GNOME-Bugzilla-Component=General diff --git a/empathy.spec b/empathy.spec index 7b44d91..4e27089 100644 --- a/empathy.spec +++ b/empathy.spec @@ -4,14 +4,18 @@ ## respectively. %global gtk2_min_version 2.16 %global glib2_min_version 2.16.0 -%global tp_mc_min_version 4.61 -%global tp_glib_min_version 0.7.31 +%global tp_mc_min_version 5.0.0 +%global tp_glib_min_version 0.7.34 %global enchant_version 1.2.0 %global network_manager_version 0.7.0 +%global libcanberra_version 0.4 +%global webkit_version 1.1.7 +%global libnotify_version 0.4.4 +%global libchamplain_version 0.3.6 Name: empathy -Version: 2.27.5 -Release: 3%{?dist} +Version: 2.27.91.1 +Release: 1%{?dist} Summary: Instant Messaging Client for GNOME Group: Applications/Communications @@ -25,9 +29,7 @@ Source1: %{name}-README.ConnectionManagers ## https://bugzilla.redhat.com/show_bug.cgi?id=436773 ## http://bugzilla.gnome.org/show_bug.cgi?id=577863 Patch1: %{name}-broken-pkgconfig.patch - -Patch2: clutter.patch - +Patch2: %{name}-desktop-category.patch # http://bugzilla.gnome.org/show_bug.cgi?id=592853 Patch3: presence-icons.patch @@ -40,10 +42,10 @@ BuildRequires: evolution-data-server-devel BuildRequires: GConf2-devel BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_min_version} -BuildRequires: gnome-doc-utils >= 0.3.2 +BuildRequires: gnome-doc-utils >= 0.17.3 BuildRequires: gnome-panel-devel -BuildRequires: libcanberra-devel >= 0.4 -BuildRequires: webkitgtk-devel >= 1.1.7 +BuildRequires: libcanberra-devel >= %{libcanberra_version} +BuildRequires: webkitgtk-devel >= %{webkit_version} BuildRequires: gtk2-devel >= %{gtk2_min_version} BuildRequires: intltool BuildRequires: libxml2-devel @@ -52,11 +54,12 @@ BuildRequires: scrollkeeper BuildRequires: telepathy-glib-devel >= %{tp_glib_min_version} BuildRequires: telepathy-mission-control-devel >= %{tp_mc_min_version} BuildRequires: telepathy-farsight-devel -BuildRequires: libnotify-devel >= 0.4.4 +BuildRequires: libnotify-devel >= %{libnotify_version} BuildRequires: NetworkManager-glib-devel >= %{network_manager_version} -BuildRequires: libchamplain-gtk-devel >= 0.3.6 +BuildRequires: libchamplain-gtk-devel >= %{libchamplain_version} BuildRequires: clutter-gtk-devel -BuildRequires: geoclue-devel >= 0.11 +BuildRequires: geoclue-devel >= 0.11 +BuildRequires: unique-devel Requires: %{name}-libs = %{version}-%{release} Requires: telepathy-filesystem @@ -133,7 +136,7 @@ bindings to the libempathy and libempathy-gtk libraries, respectively. %prep %setup -q %patch1 -p1 -b .pkgconfig -%patch2 -p1 -b .clutter +%patch2 -p1 -b .desktop %patch3 -p1 -b .presence-icons # force these to be regenerated @@ -147,7 +150,8 @@ rm data/empathy.schemas ## RPATHs are yucky. sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} +# Parallel builds are broken. +make install -m 0644 %{SOURCE1} ./README.ConnectionManagers @@ -217,9 +221,9 @@ fi %{_datadir}/empathy/ %{_datadir}/applications/fedora-%{name}*.desktop %{_datadir}/gnome/help/%{name}/ -%{_datadir}/omf/%{name}/ %{_datadir}/icons/hicolor/*/apps/%{name}* -%{_datadir}/mission-control/profiles/*.profile +%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service +%{_datadir}/telepathy/clients/Empathy.client %{_libexecdir}/megaphone-applet %{_libexecdir}/nothere-applet %{_libdir}/bonobo/servers/GNOME_Megaphone_Applet.server @@ -242,6 +246,13 @@ fi %{python_sitearch}/empathy*.so %changelog +* Wed Aug 26 2009 Brian Pepple - 2.27.91.1-1 +- Update to 2.27.91.1. +- Add BR on unique-devel. +- Update presence-icons patch. +- Add patch to fix invalid category in desktop file. +- Drop clutter patch. Fixed upstream. + * Mon Aug 24 2009 Matthias Clasen - 2.27.5-3 - Make presence icons show up in the menus diff --git a/presence-icons.patch b/presence-icons.patch index f38df78..fb28460 100644 --- a/presence-icons.patch +++ b/presence-icons.patch @@ -1,6 +1,7 @@ ---- empathy-2.27.5/libempathy-gtk/empathy-presence-chooser.c 2009-07-29 04:18:26.000000000 -0400 -+++ hacked/libempathy-gtk/empathy-presence-chooser.c 2009-08-24 02:00:31.892689425 -0400 -@@ -223,7 +223,7 @@ +diff -urp empathy-2.27.91.1.OLD/libempathy-gtk/empathy-presence-chooser.c empathy-2.27.91.1/libempathy-gtk/empathy-presence-chooser.c +--- empathy-2.27.91.1.OLD/libempathy-gtk/empathy-presence-chooser.c 2009-08-21 09:31:16.000000000 -0400 ++++ empathy-2.27.91.1/libempathy-gtk/empathy-presence-chooser.c 2009-08-25 20:51:05.340069847 -0400 +@@ -227,7 +227,7 @@ presence_chooser_create_model (EmpathyPr gtk_list_store_insert_with_values (store, NULL, -1, COL_STATUS_TEXT, _("Edit Custom Messages..."), @@ -9,11 +10,3 @@ COL_DISPLAY_MARKUP, _("Edit Custom Messages..."), COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM, -1); -@@ -1049,6 +1049,7 @@ - gtk_widget_show (image); - - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); -+ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE); - gtk_widget_show (item); - - g_object_set_data_full (G_OBJECT (item), diff --git a/sources b/sources index c8044f9..dfe5bfb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27d69e0db8874ae40d924dbf80703be6 empathy-2.27.5.tar.bz2 +6845b138d9f597932886345aeac82bc5 empathy-2.27.91.1.tar.bz2