[gtksourceview2/f15: 7/7] fix merge

[Peter Robinson]

commit de72a6d7ce8139d5c0ba35f91d1f1dbb70e7e4a3
Merge: 5dd57f6 65c17d7
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Dec 12 12:30:41 2011 +0000

    fix merge

 gtksourceview-2.11-add-libs.patch       |   22 ++++++
 gtksourceview-2.11-fix-GCONST-def.patch |  110 +++++++++++++++++++++++++++++++
 gtksourceview2.spec                     |   18 +++++-
 3 files changed, 148 insertions(+), 2 deletions(-)
---
diff --cc gtksourceview2.spec
index 45e6664,bc33663..2a93a50
--- a/gtksourceview2.spec
+++ b/gtksourceview2.spec
@@@ -81,8 -86,17 +86,17 @@@ rm -f $RPM_BUILD_ROOT%{_datadir}/gtksou
  %{_datadir}/gir-1.0/GtkSource-2.0.gir
  
  %changelog
+ * Tue Dec  6 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 2.11.2-11
+ - Add patches and fix FTBFS. Bugs 672823 716176
+ 
+ * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 2.11.2-10
+ - Rebuild for new libpng
+ 
+ * Mon Nov  7 2011 Matthias Clasen <mclasen at redhat.com> - 2.11.2-9
+ - Rebuild for new libpng
+ 
 -* Wed Jul 20 2011 Matthias Clasen <mclasen at redhat.com> - 2.11.2-8
 -- Rebuild
 +* Mon Dec 05 2011 Karsten Hopp <karsten at redhat.com> 2.11.2-8
 +- add some linker flags
  
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11.2-7
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild