From 5a7cc3d2fea5084727f8443971f01cfe8db1dc4f41560b71d5227129e00ef6f9 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 13 Aug 2019 10:46:48 +0000
Subject: [PATCH] - Update to version 1.9.1:   * This release contains some
 minor build fixes. - Changes for version 1.9.0:   * Build optimizations and
 updates. Now needs at least Meson     0.50.0, bot support for VS 2013 dropped
 in favor of VS 2017   * Lots of bug fixes   * Lots of enhancements   * Lots
 of cleanup

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/jsoncpp?expand=0&rev=51
---
 jsoncpp-1.8.4.tar.gz |  3 ---
 jsoncpp-1.9.1.tar.gz |  3 +++
 jsoncpp.changes      | 12 ++++++++++++
 jsoncpp.spec         | 33 ++++++++++++++-------------------
 4 files changed, 29 insertions(+), 22 deletions(-)
 delete mode 100644 jsoncpp-1.8.4.tar.gz
 create mode 100644 jsoncpp-1.9.1.tar.gz

diff --git a/jsoncpp-1.8.4.tar.gz b/jsoncpp-1.8.4.tar.gz
deleted file mode 100644
index f95c323..0000000
--- a/jsoncpp-1.8.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6
-size 200226
diff --git a/jsoncpp-1.9.1.tar.gz b/jsoncpp-1.9.1.tar.gz
new file mode 100644
index 0000000..87a1902
--- /dev/null
+++ b/jsoncpp-1.9.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c7b40f5605dd972108f503f031b20186f5e5bca2b65cd4b8bd6c3e4ba8126697
+size 203067
diff --git a/jsoncpp.changes b/jsoncpp.changes
index 9ef0de5..513b38f 100644
--- a/jsoncpp.changes
+++ b/jsoncpp.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Aug 13 10:37:46 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
+
+- Update to version 1.9.1:
+  * This release contains some minor build fixes.
+- Changes for version 1.9.0:
+  * Build optimizations and updates. Now needs at least Meson
+    0.50.0, bot support for VS 2013 dropped in favor of VS 2017
+  * Lots of bug fixes
+  * Lots of enhancements
+  * Lots of cleanup
+
 -------------------------------------------------------------------
 Sat Dec 23 00:09:57 UTC 2017 - avindra@opensuse.org
 
diff --git a/jsoncpp.spec b/jsoncpp.spec
index 3502bd6..d2815c9 100644
--- a/jsoncpp.spec
+++ b/jsoncpp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package jsoncpp
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,22 +12,23 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-%define sover   19
+%define sover   21
 Name:           jsoncpp
-Version:        1.8.4
+Version:        1.9.1
 Release:        0
 Summary:        C++ library that allows manipulating with JSON
 License:        MIT
 Group:          Development/Libraries/C and C++
-Url:            https://github.com/open-source-parsers/jsoncpp
+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 >= 3.1
 BuildRequires:  gcc-c++
+BuildRequires:  meson >= 0.50.0
 BuildRequires:  pkgconfig
+BuildRequires:  python3-base
 
 %description
 JSON is a lightweight data-interchange format. It can represent numbers,
@@ -69,32 +70,26 @@ format to store user input files.
 %setup -q
 
 %build
-%cmake \
-  -DBUILD_STATIC_LIBS=OFF \
-  -DJSONCPP_WITH_CMAKE_PACKAGE=ON \
-  -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-%make_jobs
+%meson \
+%meson_build
 
 %install
-%cmake_install
+%meson_install
 
 %check
-# path needs to be exported otherwise unit tests will fail
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir}
-./build/src/test_lib_json/jsoncpp_test
+%meson_test
 
 %post -n lib%{name}%{sover} -p /sbin/ldconfig
 %postun -n lib%{name}%{sover} -p /sbin/ldconfig
 
 %files -n lib%{name}%{sover}
-%doc LICENSE
+%license LICENSE
 %{_libdir}/lib%{name}.so.%{sover}*
-%{_libdir}/lib%{name}.so.%{version}
 
 %files devel
-%doc AUTHORS LICENSE README.md
+%license LICENSE
+%doc AUTHORS README.md
 %{_libdir}/pkgconfig/%{name}.pc
-%{_libdir}/cmake/%{name}
 %{_libdir}/lib%{name}.so
 %{_includedir}/json/