[empathy/f15/master: 6/6] Fix merge conflicts

[Brian Pepple]

commit 18c0d53f295b7ca0e7c78e0380a2dc69e5a6a8bd
Merge: 393bacd 035cf0c
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Thu Mar 17 14:47:19 2011 -0400

    Fix merge conflicts

 .gitignore   |    3 +++
 empathy.spec |   33 ++++++++++++++++++++++-----------
 sources      |    2 +-
 3 files changed, 26 insertions(+), 12 deletions(-)
---
diff --cc empathy.spec
index 765fd62,c10632d..aff3b44
--- a/empathy.spec
+++ b/empathy.spec
@@@ -23,8 -23,6 +23,8 @@@ URL:		http://live.gnome.org/Empath
  Source0:	http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.bz2
  Source1:	%{name}-README.ConnectionManagers
  
- Patch0:         nm09-empathy.patch
++#Patch0:         nm09-empathy.patch
 +
  BuildRequires:	enchant-devel >= %{enchant_version}
  BuildRequires:	iso-codes-devel
  BuildRequires:	desktop-file-utils
@@@ -82,7 -80,6 +82,7 @@@ It is built on top of the Telepathy fra
  
  %prep
  %setup -q
- %patch0 -p1 -b .nm09
++#%patch0 -p1 -b .nm09
  # force this to be regenerated
  rm data/empathy.desktop
  
@@@ -162,15 -159,23 +162,26 @@@ glib-compile-schemas --allow-any-name %
  
  
  %changelog
+ * Thu Mar 17 2011 Brian Pepple <bpepple at fedoraproject.org> - 2.91.91.1-1
+ - Update to 2.91.91.1.
+ - Bump min version of folks needed.
+ 
 +* Thu Mar 10 2011 Dan Williams <dcbw at redhat.com> - 2.91.90.2-2
 +- Update for NetworkManager 0.9
 +
- * Thu Mar 03 2011 Brian Pepple <bpepple at fedoraproject.org> - 2.91.90.2-1
+ * Tue Mar  8 2011 Brian Pepple <bpepple at fedoraproject.org> - 2.91.91-1
+ - Update to 2.91.91.
+ - Update minimum version of tp-glib & gtk3.
+ 
+ * Sat Feb 26 2011 Brian Pepple <bpepple at fedoraproject.org> - 2.91.90.2-1
  - Update to 2.91.90.2.
- - Bump min version for folks, tp-logger, and tp-glib.
  
- * Tue Feb 22 2011 Matthias Clasen <mclasen at redhat.com> - 2.91.90-1
- - Update to 2.91.90
+ * Fri Feb 25 2011 Brian Pepple <bpepple at fedoraproject.org> - 2.91.90.1-1
+ - Update to 2.91.90.1.
+ 
+ * Mon Feb 21 2011 Brian Pepple <bpepple at fedoraproject.org> - 2.91.90-1
+ - Update to 2.91.90.
+ - Bump min version for folks and tp-glib.
  
  * Fri Feb 11 2011 Matthias Clasen <mclasen at redhat.com> - 2.91.6-5
  - Rebuild against newer gtk