rpms/empathy/devel empathy-desktop-category.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 empathy.spec, 1.69, 1.70 presence-icons.patch, 1.1, 1.2 sources, 1.36, 1.37 button-images.patch, 1.1, NONE clutter.patch, 1.1, NONE
Brian Pepple
bpepple at fedoraproject.org
Wed Aug 26 18:39:49 UTC 2009
Author: bpepple
Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16625
Modified Files:
.cvsignore empathy.spec presence-icons.patch sources
Added Files:
empathy-desktop-category.patch
Removed Files:
button-images.patch clutter.patch
Log Message:
* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 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.
empathy-desktop-category.patch:
empathy.desktop | 2 +-
empathy.desktop.in | 2 +-
empathy.desktop.in.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE empathy-desktop-category.patch ---
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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore 29 Jul 2009 18:27:00 -0000 1.36
+++ .cvsignore 26 Aug 2009 18:39:49 -0000 1.37
@@ -1 +1 @@
-empathy-2.27.5.tar.bz2
+empathy-2.27.91.1.tar.bz2
Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- empathy.spec 24 Aug 2009 06:08:29 -0000 1.69
+++ empathy.spec 26 Aug 2009 18:39:49 -0000 1.70
@@ -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.ConnectionManage
## 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-dev
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 libempath
%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 <bpepple at fedoraproject.org> - 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 <mclasen at redhat.com> - 2.27.5-3
- Make presence icons show up in the menus
presence-icons.patch:
empathy-presence-chooser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: presence-icons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/presence-icons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- presence-icons.patch 24 Aug 2009 06:08:29 -0000 1.1
+++ presence-icons.patch 26 Aug 2009 18:39:49 -0000 1.2
@@ -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),
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources 29 Jul 2009 18:27:01 -0000 1.36
+++ sources 26 Aug 2009 18:39:49 -0000 1.37
@@ -1 +1 @@
-27d69e0db8874ae40d924dbf80703be6 empathy-2.27.5.tar.bz2
+6845b138d9f597932886345aeac82bc5 empathy-2.27.91.1.tar.bz2
--- button-images.patch DELETED ---
--- clutter.patch DELETED ---
More information about the fedora-extras-commits
mailing list