From 1004da52efb641fcad6a01c82b31ae081c1a6614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Wed, 28 Dec 2016 19:09:47 +0100
Subject: [PATCH] Update to version 1.8.0 Use up-to-date %%make-macros Run
 testsuite during %%check instead during %%build

---
 .gitignore   |  1 +
 jsoncpp.spec | 18 +++++++++++-------
 sources      |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1f3ba37..b402771 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ jsoncpp-src-0.6.0-rc2.tar.gz
 /jsoncpp-1.7.2.tar.gz
 /jsoncpp-1.7.4.tar.gz
 /jsoncpp-1.7.7.tar.gz
+/jsoncpp-1.8.0.tar.gz
diff --git a/jsoncpp.spec b/jsoncpp.spec
index 1b2219e..a268ae7 100644
--- a/jsoncpp.spec
+++ b/jsoncpp.spec
@@ -1,7 +1,7 @@
 %global jsondir json
 
 Name:       jsoncpp
-Version:    1.7.7
+Version:    1.8.0
 Release:    1%{?dist}
 Summary:    JSON library implemented in C++
 
@@ -9,7 +9,7 @@ License:    Public Domain or MIT
 URL:        https://github.com/open-source-parsers/jsoncpp
 Source0:    https://github.com/open-source-parsers/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-BuildRequires:  cmake
+BuildRequires:  cmake >= 3.1
 BuildRequires:  doxygen
 BuildRequires:  graphviz
 BuildRequires:  python
@@ -46,14 +46,15 @@ This package contains the documentation for %{name}.
        -DJSONCPP_WITH_WARNING_AS_ERROR=OFF    \
        -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON    \
        -DJSONCPP_WITH_CMAKE_PACKAGE=ON        \
+       -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \
        .
-make %{?_smp_mflags}
+%make_build
 # Build the doc
 python doxybuild.py --with-dot --doxygen %{_bindir}/doxygen
 
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html
 for f in NEWS.txt README.md ; do
@@ -63,8 +64,7 @@ install -p -m 0644 dist/doxygen/*/*.{html,png} $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 
 %check
-# Tests are run automatically in the build section
-# ctest -V %{?_smp_mflags}
+%make_build jsoncpp_check
 
 
 %post -p /sbin/ldconfig
@@ -94,6 +94,11 @@ install -p -m 0644 dist/doxygen/*/*.{html,png} $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 
 %changelog
+* Wed Dec 28 2016 Björn Esser <fedora@besser82.io> - 1.8.0-1
+- Update to version 1.8.0
+- Use up-to-date %%make-macros
+- Run testsuite during %%check instead during %%build
+
 * Mon Oct 03 2016 Björn Esser <fedora@besser82.io> - 1.7.7-1
 - Update to version 1.7.7 (#1372329)
 
@@ -196,4 +201,3 @@ install -p -m 0644 dist/doxygen/*/*.{html,png} $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 * Tue Nov 27 2012 Sébastien Willmann <sebastien.willmann@gmail.com> 0.6.0-0.1.rc2
 - Creation of the spec file
-
diff --git a/sources b/sources
index bac6e78..2ff24c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b51c65c563463220a8cb5fa33d525f8  jsoncpp-1.7.7.tar.gz
+SHA512 (jsoncpp-1.8.0.tar.gz) = bd0aa56827932e5b50231216c9f501da12053bf9eed6e83210b5c52afb9aff610e71995446a7e2f5f4580ff37762956a307867d3eaa1aebd6ca31e574c9e4d4c