[rpms/xtl] epel10: Update to latest version.

[Elliott Sales de Andrade <quantum.analyst@gmail.com>]

A new commit has been pushed.

Repo   : rpms/xtl
Branch : epel10
Commit : 6241a87eac3f8f5419c68b3cf397d0fa677d73d6
Author : Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date   : 2018-09-05T06:22:37-04:00
Stats  : +129/-9 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/xtl/c/6241a87eac3f8f5419c68b3cf397d0fa677d73d6?branch=epel10

Log:
Update to latest version.

---
diff --git a/.gitignore b/.gitignore
index 3966f97..c9a5e5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /xtl-0.4.7.tar.gz
 /xtl-0.4.13.tar.gz
 /xtl-0.4.14.tar.gz
+/xtl-0.4.15.tar.gz

diff --git a/0001-Fix-complex-test.patch b/0001-Fix-complex-test.patch
index 759501f..b87df5a 100644
--- a/0001-Fix-complex-test.patch
+++ b/0001-Fix-complex-test.patch
@@ -1,7 +1,7 @@
-From bb3fdf2fb8468ffc1e256491b7bbd029c4880978 Mon Sep 17 00:00:00 2001
+From 517cd4f961c155284916fe393445adbe0e137d2b Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Wed, 8 Aug 2018 00:03:32 -0400
-Subject: [PATCH] Fix complex test.
+Subject: [PATCH 1/2] Fix complex test.
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---

diff --git a/0002-Made-nlohmann_json-optional-in-the-tests-exported-c-.patch b/0002-Made-nlohmann_json-optional-in-the-tests-exported-c-.patch
new file mode 100644
index 0000000..831594d
--- /dev/null
+++ b/0002-Made-nlohmann_json-optional-in-the-tests-exported-c-.patch
@@ -0,0 +1,118 @@
+From 081bbc82d3c76598b8496806bb5a8b95403fc14e Mon Sep 17 00:00:00 2001
+From: Benjamin Isbarn <babene88@gmail.com>
+Date: Sat, 25 Aug 2018 12:05:41 +0200
+Subject: [PATCH 2/2] Made nlohmann_json optional in the tests, exported c++14
+ requirement (#102)
+
+Made nlohmann_json optional in the tests, exported xtl compile features c++14.
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ CMakeLists.txt          |  3 +++
+ test/CMakeLists.txt     | 24 ++++++++++++++++--------
+ test/test_xoptional.cpp |  6 ++++++
+ 3 files changed, 25 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c20ea3a..be16680 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -61,6 +61,9 @@ add_library(xtl INTERFACE)
+ target_include_directories(xtl INTERFACE $<BUILD_INTERFACE:${XTL_INCLUDE_DIR}>
+                                          $<INSTALL_INTERFACE:include>)
+ 
++# xtl requires C++14 support!
++target_compile_features(xtl INTERFACE cxx_std_14)
++
+ 
+ OPTION(BUILD_TESTS "xtl test suite" OFF)
+ OPTION(DOWNLOAD_GTEST "build gtest from downloaded sources" OFF)
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 8c91616..0f7d400 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -12,6 +12,7 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+     project(xtl-test)
+ 
+     find_package(xtl REQUIRED CONFIG)
++    find_package(nlohmann_json QUIET CONFIG)
+     set(XTL_INCLUDE_DIR ${xtl_INCLUDE_DIRS})
+ endif ()
+ 
+@@ -22,6 +23,10 @@ include(CheckCXXCompilerFlag)
+ 
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
+ 
++if(nlohmann_json_FOUND)
++  add_definitions(-DHAVE_NLOHMANN_JSON)
++endif()
++
+ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-parameter -Wextra -Wreorder -Wconversion -Wsign-conversion")
+     #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-parameter -Wextra -Wreorder -Wconversion")
+@@ -30,13 +35,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
+     if (HAS_MARCH_NATIVE)
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+     endif()
+-
+-    CHECK_CXX_COMPILER_FLAG("-std=c++14" HAS_CPP14_FLAG)
+-    if (HAS_CPP14_FLAG)
+-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+-    else()
+-        message(FATAL_ERROR "Unsupported compiler -- xtl requires C++14 support!")
+-    endif()
+ endif()
+ 
+ if(MSVC)
+@@ -111,7 +109,17 @@ add_executable(${XTL_TARGET} ${XTL_TESTS} ${XTL_HEADERS})
+ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
+     add_dependencies(${XTL_TARGET} gtest_main)
+ endif()
+-target_link_libraries(${XTL_TARGET} xtl nlohmann_json ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
++target_link_libraries(${XTL_TARGET} xtl ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
++
++if(nlohmann_json_FOUND)
++  # Version up to 3.1.2 export the target `nlohmann_json`
++  if(TARGET nlohmann_json)
++    target_link_libraries(${XTL_TARGET} nlohmann_json)
++  # Newer versions export the namespaced target `nlohmann_json::nlohmann_json`
++  elseif(TARGET nlohmann_json::nlohmann_json)
++    target_link_libraries(${XTL_TARGET} nlohmann_json::nlohmann_json)
++  endif()
++endif()
+ 
+ add_custom_target(xtest COMMAND test_xtl DEPENDS ${XTL_TARGET})
+ 
+diff --git a/test/test_xoptional.cpp b/test/test_xoptional.cpp
+index 8100453..2ac1857 100644
+--- a/test/test_xoptional.cpp
++++ b/test/test_xoptional.cpp
+@@ -15,7 +15,11 @@
+ 
+ #include "xtl/xany.hpp"
+ #include "xtl/xoptional.hpp"
++
++#ifdef HAVE_NLOHMANN_JSON
+ #include "xtl/xjson.hpp"
++#endif
++
+ #include "xtl/xoptional_sequence.hpp"
+ 
+ namespace xtl
+@@ -276,6 +280,7 @@ namespace xtl
+         EXPECT_EQ(res.has_value(), o.has_value());
+     }
+ 
++#ifdef HAVE_NLOHMANN_JSON
+     TEST(xoptional, json)
+     {
+         xoptional<double> m1 = missing<double>();
+@@ -287,4 +292,5 @@ namespace xtl
+         nlohmann::json j2 = m2;
+         EXPECT_EQ(j2.get<xoptional<double>>(), 3.0);
+     }
++#endif
+ }
+-- 
+2.17.1
+

diff --git a/sources b/sources
index 6093444..da9c651 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xtl-0.4.14.tar.gz) = 33a012240a83d9ab53316e3287983fe03eeebf44372008a59b8500df7cb1dcb26d9c34466dc8c3767029661aa7d3a8f1cfc9df3eedc2a17268985b0e2a1dff87
+SHA512 (xtl-0.4.15.tar.gz) = 821c1b98f9aa83f93b102948af2e6e88aad37fd12a13a9f4c8a3f3f5806c9edf19bf2a595e47b3f8293e7bd5b681ab4965f8ad3675c4f344bbfff19b219f22ee

diff --git a/xtl.spec b/xtl.spec
index bb42872..827d138 100644
--- a/xtl.spec
+++ b/xtl.spec
@@ -2,14 +2,16 @@
 %global debug_package %{nil}
 
 Name:           xtl
-Version:        0.4.14
-Release:        2%{?dist}
+Version:        0.4.15
+Release:        1%{?dist}
 License:        BSD
 Summary:        QuantStack tools library
 Url:            https://github.com/QuantStack/xtl
 Source0:        https://github.com/QuantStack/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 # https://github.com/QuantStack/xtl/issues/97
 Patch0001:      0001-Fix-complex-test.patch
+# https://github.com/QuantStack/xtl/pull/102
+Patch0002:      0002-Made-nlohmann_json-optional-in-the-tests-exported-c-.patch
 
 BuildRequires:  binutils
 BuildRequires:  cmake
@@ -61,10 +63,6 @@ popd
 
 
 %check
-# https://github.com/QuantStack/xtl/issues/72
-%ifarch ppc64 s390x
-export GTEST_FILTER=-hash.verification
-%endif
 make xtest
 
 
@@ -80,6 +78,9 @@ make xtest
 
 
 %changelog
+* Wed Sep 05 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.4.15-1
+- Update to latest version
+
 * Thu Aug 16 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.4.14-2
 - rebuilt