[empathy] Remove obsolete patches

Bastien Nocera hadess at fedoraproject.org
Mon Nov 15 12:55:40 UTC 2010


commit 35a563f55373a50431516edee5656dbae38233e4
Author: Bastien Nocera <hadess at hadess.net>
Date:   Mon Nov 15 12:55:40 2010 +0000

    Remove obsolete patches

 0001-Fix-Empathy-to-build-with-gcr-3.patch         |   35 ---
 ...athy-account-assistant-to-GtkComboBoxText.patch |   27 --
 ...removed-Individual-convenience-methods-fr.patch |  249 --------------------
 ...t-empathy-debug-window-to-GtkComboBoxText.patch |   34 ---
 ...t-empathy-presence-chooser-to-GtkComboBox.patch |  124 ----------
 ...pathy-status-preset-dialog-to-GtkComboBox.patch |   64 -----
 Port-to-libnotify-0.7.0.patch                      |   26 --
 empathy.spec                                       |   19 +--
 8 files changed, 2 insertions(+), 576 deletions(-)
---
diff --git a/empathy.spec b/empathy.spec
index 1fc3752..1d0170c 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -22,16 +22,8 @@ URL:		http://live.gnome.org/Empathy
 
 Source0:	http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
-Patch0:		0001-Fix-Empathy-to-build-with-gcr-3.patch
-Patch1:		Port-to-libnotify-0.7.0.patch
-Patch2:		0001-Port-empathy-account-assistant-to-GtkComboBoxText.patch
-Patch3:		0002-Port-empathy-debug-window-to-GtkComboBoxText.patch
-Patch4:		0003-Port-empathy-presence-chooser-to-GtkComboBox.patch
-Patch5:		0004-Port-empathy-status-preset-dialog-to-GtkComboBox.patch
-# http://git.gnome.org/browse/empathy/commit/?id=ff49ee828e63dd35b5c4faf3a0ccd962c7cd63a8
-Patch6:		0001-Stop-using-removed-Individual-convenience-methods-fr.patch
 # http://git.gnome.org/browse/empathy/commit/?id=5d15b2ed1f68d17364a53549ceb503275c62769d
-Patch7:		folks-api-changes.patch
+Patch0:		folks-api-changes.patch
 
 BuildRequires:	enchant-devel >= %{enchant_version}
 BuildRequires:	iso-codes-devel
@@ -86,14 +78,7 @@ It is built on top of the Telepathy framework.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcr
-%patch1 -p1 -b .notify
-%patch2 -p1 -b .accountassistant
-%patch3 -p1 -b .debugwindow
-%patch4 -p1 -b .presencechooser
-%patch5 -p1 -b .statuspreset
-%patch6 -p1 -b .folks-change
-%patch7 -p1 -b .folks-api
+%patch0 -p1 -b .folks-api
 # force this to be regenerated
 rm data/empathy.desktop
 


More information about the scm-commits mailing list