From b4a41cee81aa9a312c1bffbfd41f35ece08b08f1 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Nov 16 2021 01:28:06 +0000
Subject: Merge branch rawhide into epel8


---

diff --git a/.gitignore b/.gitignore
index 421251f..f50c306 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,7 @@
 /kcalc-20.12.3.tar.xz
 /kcalc-21.04.0.tar.xz
 /kcalc-21.04.1.tar.xz
+/kcalc-21.04.2.tar.xz
+/kcalc-21.04.3.tar.xz
+/kcalc-21.08.2.tar.xz
+/kcalc-21.08.3.tar.xz
diff --git a/kcalc.spec b/kcalc.spec
index fbd4f53..0995a62 100644
--- a/kcalc.spec
+++ b/kcalc.spec
@@ -1,4 +1,3 @@
-
 # docbook-related build busted on flatpak, omit for now -- rdieter
 %if 0%{?flatpak}
 %global no_docbook 1
@@ -6,7 +5,7 @@
 
 Name:    kcalc 
 Summary: Scientific Calculator 
-Version: 21.04.1
+Version: 21.08.3
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -22,7 +21,8 @@ Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name
 
 ## upstreamable patches
 # fix arithmetic fault in mod, factorial
-Patch100: kcalc-4.9.90-misc.patch
+## FIXME: review if still needed, rebase, upstream -- rdieter
+#Patch100: kcalc-4.9.90-misc.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: libappstream-glib
@@ -106,19 +106,29 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.d
 %license COPYING*
 #doc README
 %{_kf5_bindir}/%{name}
-%{_kf5_libdir}/libkdeinit5_%{name}.so
-#{_sysconfdir}/xdg/%{name}.knsrc
 %{_kf5_datadir}/applications/org.kde.%{name}.desktop
 %{_kf5_metainfodir}/org.kde.%{name}.appdata.xml
-#{_kf5_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_kf5_datadir}/%{name}/
 %{_kf5_datadir}/kconf_update/%{name}*
-%{_kf5_datadir}/kxmlgui5/%{name}/
-#{_kf5_datadir}/sounds/%{name}/
 %{_kf5_datadir}/config.kcfg/%{name}.kcfg
 
 
 %changelog
+* Tue Nov 02 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.08.3-1
+- 21.08.3
+
+* Thu Oct 21 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.08.2-1
+- 21.08.2
+
+* Wed Jul 28 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.04.3-1
+- 21.04.3
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 21.04.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jun 10 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.04.2-1
+- 21.04.2
+
 * Tue May 11 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.04.1-1
 - 21.04.1
 
diff --git a/sources b/sources
index 17831ce..fbeab6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kcalc-21.04.1.tar.xz) = 8b13cc974730010a05904d401dfc9081a5e5ebd13ee69cf34fec61bcc3376eb679717cedafb9c4f0a87505e9921997aacec52e80c9b5dcfce2f7495564aba923
+SHA512 (kcalc-21.08.3.tar.xz) = d9fa03aabd471de4052cbf70209420634f1fdb18b533c55207b1a363b14e77a0078ccdf42515c5c2c49c5f87c4d230a041ebc8fb7739874721b83caccf83a0b3