From 0a9df540a86ac72063a287206714ae3d342569e9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 19 Apr 2016 06:58:45 -0500 Subject: [PATCH] grantlee-5.1.0 --- .gitignore | 1 + ...l-headers-into-a-versioned-directory.patch | 56 ------------------- ...all_headers_into_versioned_directory.patch | 40 +++++++++++++ grantlee-qt5.spec | 18 ++++-- sources | 2 +- 5 files changed, 54 insertions(+), 63 deletions(-) delete mode 100644 Install-headers-into-a-versioned-directory.patch create mode 100644 grantlee-5.1.0-install_headers_into_versioned_directory.patch diff --git a/.gitignore b/.gitignore index 749dd95..a16a011 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /grantlee-5.0.0.tar.gz +/grantlee-5.1.0.tar.gz diff --git a/Install-headers-into-a-versioned-directory.patch b/Install-headers-into-a-versioned-directory.patch deleted file mode 100644 index 0d1bb40..0000000 --- a/Install-headers-into-a-versioned-directory.patch +++ /dev/null @@ -1,56 +0,0 @@ -From dfd59ab11a5421c81b83f74d15e2e493dbc3b71b Mon Sep 17 00:00:00 2001 -From: Heiko Becker -Date: Sun, 18 Jan 2015 12:33:06 +0100 -Subject: [PATCH] Install headers into a versioned directory - -Allowing to co-install grantlee-0.5 and grantlee-5. ---- - CMakeLists.txt | 2 +- - templates/lib/CMakeLists.txt | 3 +++ - textdocument/lib/CMakeLists.txt | 3 +++ - 3 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45f8673..4c0a8a5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,7 +94,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6 - set( LIB_INSTALL_DIR lib${LIB_SUFFIX} ) - set( PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/grantlee/${Grantlee_MAJOR_MINOR_VERSION_STRING} ) - set( BIN_INSTALL_DIR bin ) --set( INCLUDE_INSTALL_DIR include ) -+set( INCLUDE_INSTALL_DIR include/Grantlee5 ) - set( DATA_INSTALL_DIR share/apps ) - - # set up RPATH/install_name_dir -diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt -index 789205c..3b2d08a 100644 ---- a/templates/lib/CMakeLists.txt -+++ b/templates/lib/CMakeLists.txt -@@ -79,6 +79,9 @@ add_library(Grantlee5::Templates ALIAS Grantlee_Templates) - generate_export_header(Grantlee_Templates) - set_property(TARGET Grantlee_Templates PROPERTY EXPORT_NAME Templates) - target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags) -+target_include_directories(Grantlee_Templates -+ INTERFACE "$" -+) - - if (BUILD_TESTS) - set(GRANTLEE_TESTS_EXPORT "GRANTLEE_TEMPLATES_EXPORT") -diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt -index 14163db..c9ee757 100644 ---- a/textdocument/lib/CMakeLists.txt -+++ b/textdocument/lib/CMakeLists.txt -@@ -25,6 +25,9 @@ generate_export_header(Grantlee_TextDocument) - add_library(Grantlee::TextDocument ALIAS Grantlee_TextDocument) - set_property(TARGET Grantlee_TextDocument PROPERTY EXPORT_NAME TextDocument) - -+target_include_directories(Grantlee_TextDocument -+ INTERFACE "$" -+) - - target_link_libraries(Grantlee_TextDocument - LINK_PUBLIC Qt5::Gui --- -2.3.5 - diff --git a/grantlee-5.1.0-install_headers_into_versioned_directory.patch b/grantlee-5.1.0-install_headers_into_versioned_directory.patch new file mode 100644 index 0000000..8788469 --- /dev/null +++ b/grantlee-5.1.0-install_headers_into_versioned_directory.patch @@ -0,0 +1,40 @@ +diff -up grantlee-5.1.0/CMakeLists.txt.orig grantlee-5.1.0/CMakeLists.txt +--- grantlee-5.1.0/CMakeLists.txt.orig 2016-04-19 01:33:17.000000000 -0500 ++++ grantlee-5.1.0/CMakeLists.txt 2016-04-19 06:44:06.371122149 -0500 +@@ -100,7 +100,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define + set( LIB_INSTALL_DIR lib${LIB_SUFFIX} ) + set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} ) + set( BIN_INSTALL_DIR bin ) +-set( INCLUDE_INSTALL_DIR include ) ++set( INCLUDE_INSTALL_DIR include/Grantlee5 ) + set( DATA_INSTALL_DIR share/apps ) + + # set up RPATH/install_name_dir +diff -up grantlee-5.1.0/templates/lib/CMakeLists.txt.orig grantlee-5.1.0/templates/lib/CMakeLists.txt +--- grantlee-5.1.0/templates/lib/CMakeLists.txt.orig 2016-04-19 06:44:06.371122149 -0500 ++++ grantlee-5.1.0/templates/lib/CMakeLists.txt 2016-04-19 06:44:55.763336264 -0500 +@@ -107,6 +107,10 @@ if (Qt5Script_FOUND) + + target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS}) + target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags) ++ target_include_directories(Grantlee_Templates ++ INTERFACE "$" ++ ) ++ + target_link_libraries(Grantlee_Templates + LINK_PRIVATE Qt5::Script + ) +diff -up grantlee-5.1.0/textdocument/lib/CMakeLists.txt.orig grantlee-5.1.0/textdocument/lib/CMakeLists.txt +--- grantlee-5.1.0/textdocument/lib/CMakeLists.txt.orig 2016-04-19 06:44:06.371122149 -0500 ++++ grantlee-5.1.0/textdocument/lib/CMakeLists.txt 2016-04-19 06:45:56.268598553 -0500 +@@ -43,6 +43,10 @@ if (CMAKE_GENERATOR MATCHES "Visual Stud + endforeach() + endif() + ++target_include_directories(Grantlee_TextDocument ++ INTERFACE "$" ++) ++ + target_link_libraries(Grantlee_TextDocument + LINK_PUBLIC Qt5::Gui + ) diff --git a/grantlee-qt5.spec b/grantlee-qt5.spec index 212d805..7129a14 100644 --- a/grantlee-qt5.spec +++ b/grantlee-qt5.spec @@ -3,17 +3,20 @@ Name: grantlee-qt5 Summary: Qt5 string template engine based on the Django template system -Version: 5.0.0 -Release: 4%{?dist} +Version: 5.1.0 +Release: 1%{?dist} License: LGPLv2+ URL: https://github.com/steveire/grantlee Source0: http://downloads.grantlee.org/grantlee-%{version}%{?pre:-%{pre}}.tar.gz +%global majmin_ver %(echo %{version} | cut -d. -f1,2) + ## upstreamable patches # Install headers into a versioned directory to be parallel-installable +# based on: # https://github.com/steveire/grantlee/pull/1 -Patch1: Install-headers-into-a-versioned-directory.patch +Patch1: grantlee-5.1.0-install_headers_into_versioned_directory.patch BuildRequires: cmake >= 2.8.12 BuildRequires: pkgconfig(Qt5Gui) @@ -63,7 +66,7 @@ format for easy browsing. %prep -%autosetup -p1 -n grantlee-%{version} +%autosetup -n grantlee-%{version} -p1 %build @@ -99,11 +102,11 @@ xvfb-run -a make test -C %{_target_platform} ||: %files %license COPYING.LIB -%doc AUTHORS CHANGELOG README +%doc AUTHORS CHANGELOG README.md %{_libdir}/libGrantlee_Templates.so.5* %{_libdir}/libGrantlee_TextDocument.so.5* %dir %{_libdir}/grantlee/ -%{_libdir}/grantlee/5.0/ +%{_libdir}/grantlee/%{majmin_ver}/ %files devel %{_includedir}/Grantlee5/ @@ -118,6 +121,9 @@ xvfb-run -a make test -C %{_target_platform} ||: %changelog +* Tue Apr 19 2016 Rex Dieter - 5.1.0-1 +- grantlee-5.1.0 + * Fri Feb 19 2016 Rex Dieter 5.0.0-4 - grantlee-qt5: FTBFS in rawhide (#1307592) diff --git a/sources b/sources index 2575e80..9b7a65c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -feb7f82d08e046fe078ea475dee710f6 grantlee-5.0.0.tar.gz +57989ae9f7c113e682ef1713a6f1e92a grantlee-5.1.0.tar.gz