adjust synaptics hacks (for rhel8), bump kf5 dep

plasma-desktop-5.18.4.1-synaptics_includes.patch

@@ -1,12 +0,0 @@
-diff -up plasma-desktop-5.18.4.1/kcms/touchpad/src/backends/x11/xlibbackend.cpp.syn plasma-desktop-5.18.4.1/kcms/touchpad/src/backends/x11/xlibbackend.cpp
---- plasma-desktop-5.18.4.1/kcms/touchpad/src/backends/x11/xlibbackend.cpp.syn	2020-03-31 09:24:01.000000000 -0500
-+++ plasma-desktop-5.18.4.1/kcms/touchpad/src/backends/x11/xlibbackend.cpp	2020-05-03 13:20:06.830569831 -0500
-@@ -42,7 +42,7 @@
- #include <X11/extensions/XInput.h>
- #include <X11/extensions/XInput2.h>
- 
--#include <synaptics-properties.h>
-+#include <xorg/synaptics-properties.h>
- #include <xserver-properties.h>
- 
- struct DeviceListDeleter

plasma-desktop.spec

@@ -1,5 +1,5 @@
 
-%global kf5_version_min 5.42
+%global kf5_version_min 5.69
 
 %global synaptics 1
 %global scim 1
@@ -11,7 +11,7 @@
 Name:    plasma-desktop
 Summary: Plasma Desktop shell
 Version: 5.19.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+ and (GPLv2 or GPLv3)
 URL:     https://cgit.kde.org/%{name}.git
@@ -37,7 +37,6 @@ Patch100: plasma-desktop-5.8-default_favorites.patch
 Patch200: https://gitweb.gentoo.org/proj/kde.git/plain/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
 # use this bundled copy (from f31) if not provided already
 Source200: synaptics-properties.h
-Patch201: plasma-desktop-5.18.4.1-synaptics_includes.patch
 
 # filter qmk/plugins provides
 %global __provides_exclude_from ^(%{_kf5_qmldir}/.*\\.so|%{_kf5_qtplugindir}/.*\\.so)$
@@ -192,11 +191,10 @@ BuildArch: noarch
 ## upstream patches
 
 ## upstreamable patches
-#%patch200 -p1
+%patch200 -p1
 %if ! 0%{?synaptics}
 install -pD %{SOURCE200} 3rdparty/xorg/synaptics-properties.h
 %endif
-#%patch201 -p1 -b .synaptics_includes
 
 ## downstream patches
 %patch100 -p1
@@ -220,7 +218,7 @@ sed -i.breeze_ver \
 mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kf5} .. \
-  %{?!synaptics:-DSynaptics_INCLUDE_DIRS:PATH="$(pwd)/../3rdparty"}
+  %{?!synaptics:-DSynaptics_INCLUDE_DIRS:PATH="$(pwd)/../3rdparty/xorg"}
 popd
 
 %make_build -C %{_target_platform}
@@ -350,6 +348,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k
 
 
 %changelog
+* Wed Jun 10 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.19.0-2
+- adjust synaptics hacks (for rhel8), bump kf5 dep
+
 * Tue Jun 9 2020 Martin Kyral <martin.kyral@gmail.com> - 5.19.0-1
 - 5.19.0