From d8d243dad15840a52cb6d6644d98140e3c1e3fb3 Mon Sep 17 00:00:00 2001
From: Dominic Hopf <dmaphy@fedoraproject.org>
Date: Jul 11 2016 08:09:57 +0000
Subject: Merge branch 'f24' into f23


* f24:
  Version of bundled Scintilla has changed as well: 3.5.6 -> 3.6.6

---

diff --git a/geany.spec b/geany.spec
index 490e6c7..578b87c 100644
--- a/geany.spec
+++ b/geany.spec
@@ -5,7 +5,7 @@
 
 Name:      geany
 Version:   1.28
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -42,7 +42,7 @@ BuildRequires: desktop-file-utils, gettext, gtk2-devel, glib2-devel, pango-devel
 BuildRequires: perl(XML::Parser)
 Requires: vte
 Requires: geany-libgeany = %{version}-%{release}
-Provides: bundled(scintilla) = 3.5.6
+Provides: bundled(scintilla) = 3.6.6
 
 
 %description
@@ -194,6 +194,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Mon Jul 11 2016 Dominic Hopf <dmaphy@fedoraproject.org> - 1.28-2
+- Version of bundled Scintilla has changed as well: 3.5.6 -> 3.6.6
+
 * Sun Jul 10 2016 Dominic Hopf <dmaphy@fedoraproject.org> - 1.28-1
 - New upstream release: Geany 1.28