From 4db3bf69247065319d8a5dc7e8a71f17a2cef757 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Fri, 14 Feb 2020 14:08:35 -0800
Subject: [PATCH] Fix templates multiversion include directory

---
 ...all_headers_into_versioned_directory.patch | 28 +++++++++----------
 grantlee-qt5.spec                             |  5 +++-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/grantlee-5.2.0-install_headers_into_versioned_directory.patch b/grantlee-5.2.0-install_headers_into_versioned_directory.patch
index 51f1806..8d6ce77 100644
--- a/grantlee-5.2.0-install_headers_into_versioned_directory.patch
+++ b/grantlee-5.2.0-install_headers_into_versioned_directory.patch
@@ -1,13 +1,13 @@
-From 2ce2cb510a39ee42619745a98b14e32744d1bf75 Mon Sep 17 00:00:00 2001
+From 9dfa187569e4c9c4e72ace60c051cbfa79434d77 Mon Sep 17 00:00:00 2001
 From: Troy Dawson <tdawson@redhat.com>
-Date: Tue, 28 Jan 2020 13:19:10 -0800
+Date: Fri, 14 Feb 2020 13:43:27 -0800
 Subject: [PATCH] install headers into versioned directory
 
 ---
  CMakeLists.txt                  | 1 +
- templates/lib/CMakeLists.txt    | 8 ++++++--
+ templates/lib/CMakeLists.txt    | 6 ++++--
  textdocument/lib/CMakeLists.txt | 8 ++++++--
- 3 files changed, 13 insertions(+), 4 deletions(-)
+ 3 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 20edcdc..8df3dd6 100644
@@ -22,21 +22,19 @@ index 20edcdc..8df3dd6 100644
  # set up RPATH/install_name_dir
  set( CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR})
 diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
-index 5058481..ec1fd3a 100644
+index 5058481..c4262f3 100644
 --- a/templates/lib/CMakeLists.txt
 +++ b/templates/lib/CMakeLists.txt
-@@ -101,6 +101,10 @@ if (Qt5Qml_FOUND)
+@@ -106,6 +106,8 @@ if (Qt5Qml_FOUND)
+   )
+ endif()
  
-   target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS})
-   target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
-+  target_include_directories(Grantlee_Templates
-+    INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>"
-+  )
++target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
 +
-   target_link_libraries(Grantlee_Templates
-     PRIVATE Qt5::Qml
-   )
-@@ -152,10 +156,10 @@ install(FILES
+ if (BUILD_TESTS)
+   set(GRANTLEE_TESTS_EXPORT "GRANTLEE_TEMPLATES_EXPORT")
+ endif()
+@@ -152,10 +154,10 @@ install(FILES
    token.h
    util.h
    variable.h
diff --git a/grantlee-qt5.spec b/grantlee-qt5.spec
index 3fa7794..c4b4ee9 100644
--- a/grantlee-qt5.spec
+++ b/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: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPLv2+
 URL:     https://github.com/steveire/grantlee
@@ -135,6 +135,9 @@ xvfb-run -a make test -C %{_target_platform} ||:
 
 
 %changelog
+* Fri Feb 14 2020 Troy Dawson <tdawson@redhat.com> - 5.2.0-3
+- Fix templates multiversion include directory
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild