From a7306d1ea7934050d7b7c8a7e5a8ba360ca43295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 16 Aug 2019 18:16:06 +0200 Subject: [PATCH] Update to version 1.9.1 (rhbz#1742004) --- .gitignore | 15 +++------------ jsoncpp-1.9.1-fix_version.patch | 26 ++++++++++++++++++++++++++ jsoncpp.spec | 9 +++++++-- sources | 2 +- 4 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 jsoncpp-1.9.1-fix_version.patch diff --git a/.gitignore b/.gitignore index df5a54b..931376c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,3 @@ -jsoncpp.pc -jsoncpp-src-0.6.0-rc2.tar.gz -/jsoncpp-0.10.5.tar.gz -/jsoncpp-1.7.1.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 -/jsoncpp-1.8.1.tar.gz -/jsoncpp-1.8.3.tar.gz -/jsoncpp-1.8.4.tar.gz -/jsoncpp-1.9.0.tar.gz +/jsoncpp.pc +/jsoncpp-src-*.tar.gz +/jsoncpp-*.tar.gz diff --git a/jsoncpp-1.9.1-fix_version.patch b/jsoncpp-1.9.1-fix_version.patch new file mode 100644 index 0000000..3a8455c --- /dev/null +++ b/jsoncpp-1.9.1-fix_version.patch @@ -0,0 +1,26 @@ +Index: jsoncpp-1.9.1/CMakeLists.txt +=================================================================== +--- jsoncpp-1.9.1.orig/CMakeLists.txt ++++ jsoncpp-1.9.1/CMakeLists.txt +@@ -63,7 +63,7 @@ if(NOT DEFINED CMAKE_BUILD_TYPE) + endif() + + project(JSONCPP +- VERSION 1.9.0 # [.[.[.]]] ++ VERSION 1.9.1 # [.[.[.]]] + LANGUAGES CXX) + + message(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}") +Index: jsoncpp-1.9.1/meson.build +=================================================================== +--- jsoncpp-1.9.1.orig/meson.build ++++ jsoncpp-1.9.1/meson.build +@@ -1,7 +1,7 @@ + project( + 'jsoncpp', + 'cpp', +- version : '1.9.0', ++ version : '1.9.1', + default_options : [ + 'buildtype=release', + 'cpp_std=c++11', diff --git a/jsoncpp.spec b/jsoncpp.spec index 20b2831..4a13b82 100644 --- a/jsoncpp.spec +++ b/jsoncpp.spec @@ -10,14 +10,16 @@ Name: jsoncpp -Version: 1.9.0 -Release: 2%{?dist} +Version: 1.9.1 +Release: 1%{?dist} Summary: JSON library implemented in C++ License: Public Domain or MIT URL: https://github.com/open-source-parsers/%{name} Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0000: %{name}-1.9.1-fix_version.patch + BuildRequires: cmake >= 3.1 BuildRequires: gcc BuildRequires: gcc-c++ @@ -128,6 +130,9 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name} %changelog +* Fri Aug 16 2019 Björn Esser - 1.9.1-1 +- Update to version 1.9.1 (rhbz#1742004) + * Thu Jul 25 2019 Fedora Release Engineering - 1.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 97ac2ef..616a3c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsoncpp-1.9.0.tar.gz) = b1da96c12d9ad4c7e002ed84b6c0ff24a7c86034f462a4eb29d93be2f81d7961a03d6f7aa3e7fa58366a2ed76242f6c72e8c3c6d34bdf562c86ca9951f5f3785 +SHA512 (jsoncpp-1.9.1.tar.gz) = 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766