Merge branch 'epel8-playground' into epel8

* epel8-playground:
  Release bump
  Initial build for EPEL8 using the F32 sources

.gitignore

@@ -1,22 +1 @@
-geany-0.19.tar.bz2
-/geany-0.19.1.tar.bz2
-/geany-0.19.2.tar.bz2
-/geany-0.20.tar.bz2
-/geany-0.21.tar.bz2
-/geany-1.22.tar.bz2
-/geany-1.23.tar.bz2
-/geany-1.23.1.tar.bz2
-/geany-1.24.tar.bz2
-/geany-1.24.1.tar.bz2
-/geany-1.25.tar.bz2
-/geany-1.26.tar.bz2
-/geany-1.27.tar.bz2
-/geany-1.28.tar.bz2
-/geany-1.29.tar.bz2
-/geany-1.30.tar.bz2
-/geany-1.30.1.tar.bz2
-/geany-1.31.tar.bz2
-/geany-1.32.tar.bz2
-/geany-1.34.1.tar.bz2
-/geany-1.35.tar.bz2
 /geany-1.36.tar.bz2

geany.spec

@@ -5,19 +5,22 @@
 
 Name:      geany
 Version:   1.36
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   A fast and lightweight IDE using GTK3
 
-Group:     Development/Tools
+License:   GPLv2+ and MIT
-License:   GPLv2+
 URL:       http://www.geany.org/
 Source0:   http://download.geany.org/%{name}-%{version}.tar.bz2
 
-BuildRequires: desktop-file-utils, gettext, gtk3-devel, glib2-devel, pango-devel, intltool
+BuildRequires: gcc gcc-c++
+BuildRequires: python3-docutils
+BuildRequires: desktop-file-utils, gettext, pango-devel, intltool
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: perl(XML::Parser)
-Requires: vte3
+Requires: vte291%{?_isa}
 Requires: geany-libgeany = %{version}-%{release}
-Provides: bundled(scintilla) = 3.10.2
+Provides: bundled(scintilla) = 3.10.4
 
 
 %description
@@ -40,7 +43,6 @@ Some features:
 
 %package libgeany
 Summary:   Core functions of Geany
-Group:     Development/Tools
 Requires:  geany = %{version}-%{release}
 
 %description libgeany
@@ -50,7 +52,6 @@ Geany plugins.
 
 %package devel
 Summary:   Header files for building Geany plug-ins
-Group:     Development/Tools
 Requires:  geany = %{version}-%{release}
 Requires:  pkgconfig gtk3-devel
 
@@ -68,6 +69,8 @@ rm -f wscript
 
 
 %build
+RST2HTML=/usr/bin/rst2html-3
+
 %configure --docdir=%{geany_docdir} --enable-gtk3
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -123,25 +126,11 @@ SentUpstream: 2014-09-17
 </application>
 EOF
 
-%post
-update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
 %files -f %{name}.lang
-%defattr(-, root, root, -)
 %exclude %{geany_docdir}/TODO
 
 %doc %{geany_docdir}
-%doc %{_mandir}/man1/geany.1.*
+%doc %{_mandir}/man1/geany.1*
 
 %{_bindir}/%{name}
 %{_datadir}/%{name}
@@ -155,23 +144,54 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libgeany.so*
 
 %files devel
-%defattr(-, root, root, -)
 %doc HACKING TODO
 %{_includedir}/geany
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
-* Sun Apr 05 2020 Dominic Hopf <dmaphy@fedoraproject.org> - 1.36-2
+* Wed Apr 08 2020 Dominic Hopf <dmaphy@fedoraproject.org> - 1.36-3
 - Release bump
 
-* Sun Nov 10 2019 Dominic Hopf <dmaphy@fedoraproject.org> - 1.36-1
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.36-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Sep 29 2019 Dominic Hopf <dmaphy@fedoraproject.org> - 1.36-1
 - New upstream release: Geany 1.36
 
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.35-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sat May 04 2019 Dominic Hopf <dmaphy@fedoraproject.org> - 1.35-1
 - New upstream release: Geany 1.35
 
-* Sat Mar 09 2019 Dominic Hopf <dmaphy@fedoraproject.org> - 1.34.1-1
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.34.1-3
-- New upstream release: Geany 1.34 (RHBZ#1669352)
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jan 05 2019 Dominic Hopf <dmaphy@fedoraproject.org> - 1.34.1-2
+- New upstream release: Geany 1.34.1
+
+* Mon Dec 31 2018 Dominic Hopf <dmaphy@fedoraproject.org> - 1.34-1
+- New upstream release: Geany 1.34
+- Use the Python3 version of rst2html
+
+* Mon Aug 13 2018 Kalev Lember <klember@redhat.com> - 1.33-4
+- Require newer vte291 instead of vte3
+
+* Sun Jul 22 2018 Dominic Hopf <dmaphy@fedoraproject.org> - 1.33-3
+- RHBZ#1604065: Fix FTBFS, add gcc-c++ as BuildRequires
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 28 2018 Dominic Hopf <dmaphy@fedoraproject.org> - 1.33-1
+- New upstream release: Geany 1.33
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.32-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Jan 28 2018 Dominic Hopf <dmaphy@fedoraproject.org> - 1.32-3
+- Use pkgconfig to define requires (RHBZ#1539329)
+- Fix license tag (RHBZ#1539333)
 
 * Mon Nov 27 2017 Dominic Hopf <dmaphy@fedoraproject.org> - 1.32-1
 - New upstream release: Geany 1.32