From 5593e41c93cd8f05a8560a138040abfd635e3343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 30 May 2020 11:30:00 +0200 Subject: [PATCH] Update to version 1.9.3 (rhbz#1841985) --- jsoncpp.spec | 42 ++++++++++++++++++++++++------------------ sources | 2 +- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/jsoncpp.spec b/jsoncpp.spec index a37e037..43bed5b 100644 --- a/jsoncpp.spec +++ b/jsoncpp.spec @@ -6,17 +6,17 @@ # Avoid accidental so-name bumps. # ATTENTION!!! You need to run a bootstrap build # of cmake *BEFORE* bumping the so-name here! -%global sover 22 +%global sover 24 Name: jsoncpp -Version: 1.9.2 -Release: 2%{?dist} +Version: 1.9.3 +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 +Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake >= 3.1 BuildRequires: gcc @@ -62,28 +62,31 @@ sed -i -e 's!^DOT_FONTNAME.*=.*!DOT_FONTNAME =!g' doc/doxyfile.in %build -mkdir -p %{_target_platform} -pushd %{_target_platform} -%cmake -DBUILD_STATIC_LIBS=OFF \ - -DJSONCPP_WITH_WARNING_AS_ERROR=OFF \ - -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON \ - -DJSONCPP_WITH_CMAKE_PACKAGE=ON \ - -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \ - -DPYTHON_EXECUTABLE="%{__python3}" \ - .. -popd -%make_build -C %{_target_platform} +mkdir -p %{_vpath_builddir} +%cmake \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DJSONCPP_WITH_CMAKE_PACKAGE:BOOL=ON \ + -DJSONCPP_WITH_EXAMPLE:BOOL=OFF \ + -DJSONCPP_WITH_PKGCONFIG_SUPPORT:BOOL=ON \ + -DJSONCPP_WITH_POST_BUILD_UNITTEST:BOOL=OFF \ + -DJSONCPP_WITH_STRICT_ISO:BOOL=ON \ + -DJSONCPP_WITH_TESTS:BOOL=ON \ + -DJSONCPP_WITH_WARNING_AS_ERROR:BOOL=OFF \ + -DPYTHON_EXECUTABLE:STRING="%{__python3}" \ + -B $PWD/%{_vpath_builddir} \ + -S $PWD +%make_build -C %{_vpath_builddir} %if %{with jsoncpp_enables_doc} # Build the doc -cp -p %{_target_platform}/version . +cp -p %{_vpath_builddir}/version . %{__python3} doxybuild.py --with-dot --doxygen %{_bindir}/doxygen rm -f version %endif %install -%make_install -C %{_target_platform} +%make_install -C %{_vpath_builddir} mkdir -p %{buildroot}%{_docdir}/%{name} install -pm 0644 README.md %{buildroot}%{_docdir}/%{name} @@ -96,7 +99,7 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name} %check -%make_build -C %{_target_platform} jsoncpp_check +%make_build -C %{_vpath_builddir} jsoncpp_check %ldconfig_scriptlets @@ -128,6 +131,9 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name} %changelog +* Sat May 30 2020 Björn Esser - 1.9.3-1 +- Update to version 1.9.3 (rhbz#1841985) + * Wed Jan 29 2020 Fedora Release Engineering - 1.9.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index d676ec3..033b8ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsoncpp-1.9.2.tar.gz) = 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640 +SHA512 (jsoncpp-1.9.3.tar.gz) = f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559