drop problematic versioned includes patch

For now... means we add
Conflicts: grantlee-devel
which isn't a huge deal, as only 1 package in fedora currently depends on it

grantlee-qt5.spec

@@ -4,7 +4,7 @@
 Name:    grantlee-qt5
 Summary: Qt5 string template engine based on the Django template system
 Version: 5.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: LGPLv2+
 URL:     https://github.com/steveire/grantlee
@@ -20,7 +20,7 @@ Provides: %{name}(%{grantlee5_plugins}) = %{version}-%{release}
 # Install headers into a versioned directory to be parallel-installable
 # based on:
 # https://github.com/steveire/grantlee/pull/1
-Patch1: grantlee-5.2.0-install_headers_into_versioned_directory.patch
+#Patch1: grantlee-5.2.0-install_headers_into_versioned_directory.patch
 
 BuildRequires: cmake >= 2.8.12
 BuildRequires: gcc-c++
@@ -55,6 +55,9 @@ how to write templates, see the documentation.
 %package devel
 Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
+# without versioning patch above, conflicts with older kde4 grantlee-devel
+# no biggie, only one pkg in distro depends on kde4 grantlee -- rex
+Conflicts: grantlee-devel
 %description devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -122,7 +125,9 @@ xvfb-run -a make test -C %{_target_platform} ||:
 %{grantlee5_plugindir}/
 
 %files devel
-%{_includedir}/Grantlee5/
+%{_includedir}/grantlee/
+%{_includedir}/grantlee_templates.h
+%{_includedir}/grantlee_textdocument.h
 %{_libdir}/libGrantlee_Templates.so
 %{_libdir}/libGrantlee_TextDocument.so
 %{_libdir}/cmake/Grantlee5/
@@ -135,6 +140,9 @@ xvfb-run -a make test -C %{_target_platform} ||:
 
 
 %changelog
+* Mon Feb 17 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.2.0-4
+- drop problematic versioned includes patch
+
 * Fri Feb 14 2020 Troy Dawson <tdawson@redhat.com> - 5.2.0-3
 - Fix templates multiversion include directory