From e71ab96dfbfd218bcca2e0a2a6d479a367701916 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Apr 30 2020 16:29:08 +0000
Subject: Merge branch 'f32' into epel8


---

diff --git a/.gitignore b/.gitignore
index cd5cb09..1e3b4f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,12 @@
 /kapidox-5.57.0.tar.xz
 /kapidox-5.58.0.tar.xz
 /kapidox-5.59.0.tar.xz
+/kapidox-5.60.0.tar.xz
+/kapidox-5.61.0.tar.xz
+/kapidox-5.62.0.tar.xz
+/kapidox-5.63.0.tar.xz
+/kapidox-5.64.0.tar.xz
+/kapidox-5.65.0.tar.xz
+/kapidox-5.66.0.tar.xz
+/kapidox-5.67.0.tar.xz
+/kapidox-5.68.0.tar.xz
diff --git a/kf5-kapidox.spec b/kf5-kapidox.spec
index 7aa4fb9..aec5a06 100644
--- a/kf5-kapidox.spec
+++ b/kf5-kapidox.spec
@@ -1,7 +1,7 @@
 %global framework kapidox
 
 Name:    kf5-%{framework}
-Version: 5.59.0
+Version: 5.68.0
 Release: 1%{?dist}
 Summary: KDE Frameworks 5 Tier 4 scripts and data for building API documentation
 
@@ -26,7 +26,7 @@ BuildRequires:  kf5-rpm-macros >= %{majmin}
 
 Requires:       kf5-filesystem >= %{majmin}
 
-%if 0%{?fedora} > 28
+%if 0%{?fedora} > 28 || 0%{?rhel} > 7
 BuildRequires:  python3-devel python3
 %global __python %{__python3}
 %global python_sitelib %{python3_sitelib}
@@ -79,6 +79,45 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Fri Mar 20 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.68.0-1
+- 5.68.0
+
+* Sun Feb 02 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.67.0-1
+- 5.67.0
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.66.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jan 07 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.66.0-1
+- 5.66.0
+
+* Tue Dec 17 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.65.0-1
+- 5.65.0
+
+* Wed Dec 11 2019 Troy Dawson <tdawson@redhat.com> - 5.64.0-2
+- rhel8 uses python3
+
+* Fri Nov 08 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.64.0-1
+- 5.64.0
+
+* Tue Oct 22 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.63.0-1
+- 5.63.0
+
+* Mon Sep 16 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.62.0-1
+- 5.62.0
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 5.61.0-2
+- Rebuilt for Python 3.8
+
+* Wed Aug 07 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.61.0-1
+- 5.61.0
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.60.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Jul 13 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.60.0-1
+- 5.60.0
+
 * Thu Jun 06 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.59.0-1
 - 5.59.0
 
diff --git a/sources b/sources
index 308eaa7..e1bdaf8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kapidox-5.59.0.tar.xz) = 0394c2038a16023d1e21641fa56791b0ea26b989729f15b4e802ee9f9e6282e2252cce858ff722b00d7efaf1b14934bbadd7d492dcaa76a5bcd651b6ca825ec8
+SHA512 (kapidox-5.68.0.tar.xz) = f4cba0cc1c90d30d07ce8acb18462982f6258bce0249c04f1fd398e9bebd9c265af35c301bbf157ab5d0cf1882c3ccc67d1d0a4672dab357a54f89975be89687