rpms/empathy/devel .cvsignore, 1.58, 1.59 empathy.spec, 1.107, 1.108 sources, 1.58, 1.59

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22804

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
2.31.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	10 May 2010 22:56:20 -0000	1.58
+++ .cvsignore	28 May 2010 17:23:31 -0000	1.59
@@ -1 +1 @@
-empathy-2.31.1.tar.bz2
+empathy-2.31.2.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- empathy.spec	10 May 2010 22:56:20 -0000	1.107
+++ empathy.spec	28 May 2010 17:23:32 -0000	1.108
@@ -11,7 +11,7 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.31.1
+Version:	2.31.2
 Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
@@ -19,12 +19,9 @@ Group:		Applications/Communications
 License:	GPLv2+
 URL:		http://live.gnome.org/Empathy
 
-Source0:	http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=592853
-Patch1:		presence-icons.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -87,7 +84,6 @@ It is built on top of the Telepathy fram
 
 %prep
 %setup -q
-%patch1 -p1 -b .presence-icons
 # force these to be regenerated
 rm data/empathy.desktop
 rm data/empathy.schemas
@@ -161,6 +157,10 @@ fi
 %{_mandir}/man1/empathy*.1.gz
 
 %changelog
+* Fri May 28 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.2-1
+- Update to 2.31.2
+- drop presence-icon patch, handled upstream (partially)
+
 * Mon May 10 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.31.1-1
 - Update to 2.31.1.
 - Bump min versions of gtk2 & tp-glib needed.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	10 May 2010 22:56:20 -0000	1.58
+++ sources	28 May 2010 17:23:32 -0000	1.59
@@ -1 +1 @@
-59a3a02e4c9894887ca1b68963a872fa  empathy-2.31.1.tar.bz2
+13db1d4d9c4bee2bbf0defd96e1f9881  empathy-2.31.2.tar.bz2