[geany/el6: 17/17] Merge branch 'epel7' into el6

[Dominic Hopf]

commit 0be1f276ab59adb83bf352ae2162cacba771c4cb
Merge: a59d348 dca092c
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Mon Apr 28 21:35:50 2014 +0200

    Merge branch 'epel7' into el6
    
    Conflicts:
    	geany.spec

 .gitignore                        |    5 +
 geany-api-0.21.c.tags             | 4237 +++++++++++++++++++++
 geany.spec                        |   97 +-
 gtk220.c.tags => gtk224.c.tags    | 7372 ++++++++++++++++++++++++-------------
 gtk220.c.tags => gtk_-2.24.c.tags | 7372 ++++++++++++++++++++++++-------------
 sources                           |    2 +-
 sqlite3.c.tags                    |  612 +++-
 std.css.tags                      |  281 ++
 xfce46.c.tags                     | 4063 --------------------
 xfce48.c.tags                     | 1492 ++++++++
 10 files changed, 16287 insertions(+), 9246 deletions(-)
---
diff --cc geany.spec
index ad27f6d,678c886..9091b8a
--- a/geany.spec
+++ b/geany.spec
@@@ -144,9 -137,49 +137,43 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_libdir}/pkgconfig/geany.pc
  
  %changelog
+ * Thu Apr 17 2014 Dominic Hopf <dmaphy at fedoraproject.org> - 1.24.1-1 
+ - New upstream release: Geany 1.24.1
+ 
+ * Tue Apr 15 2014 Dominic Hopf <dmaphy at fedoraproject.org> - 1.24-1
+ - New upstream release: Geany 1.24
+ - update sqlite3.c.tags and add std.css.tags for CSS3
+ - fix bogus date warnings
+ 
+ * Fri Jul 26 2013 Ville Skyttä <ville.skytta at iki.fi> - 1.23.1-2
+ - Install docs to %%{_pkgdocdir} where available.
+ 
+ * Sun May 19 2013 Dominic Hopf <dmaphy at fedoraproject.org> - 1.23.1-1
+ - New upstream release: Geany 1.23.1
+ 
+ * Tue Apr 09 2013 Jon Ciesla <limburgher at gmail.com> - 1.23-2
+ - Drop desktop vendor tag.
+ 
+ * Sun Mar 10 2013 Dominic Hopf <dmaphy at fedoraproject.org> - 1.23-1
+ - New upstream release: Geany 1.23
+ 
 -* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.22-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
 -* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.22-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
+ * Tue Jun 19 2012 Dominic Hopf <dmaphy at fedoraproject.org> - 1.22-1
+ - New upstream release: Geany 1.22
+ - remove the previous patch to fix DSO linking, this is now included upstream
+ - update upstream URLs for tags files
+ 
+ * Mon May 21 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.21-5
+ - Add patch to fix FTBFS due to DSO linking, spec cleanup
+ 
 -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
+ * Sat Dec 24 2011 Dominic Hopf <dmaphy at fedoraproject.org> - 0.21-3
+ - update GTK+ tags to 2.24
+ 
+ * Sun Dec 18 2011 Dominic Hopf <dmaphy at fedoraproject.org> - 0.21-2
+ - update Xfce tags to 4.8
+ 
 +* Tue Nov 15 2011 François Cami <fcami at fedoraproject.org> - 0.21-1
 +- EPEL6 branch.
 +
  * Sun Oct 02 2011 Dominic Hopf <dmaphy at fedoraproject.org> - 0.21-1
  - New upstream release: Geany 0.21