From 295992158645de03f619e6041ef292bd768fa4c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Tue, 26 Dec 2017 08:47:41 +0100
Subject: [PATCH] Update to version 1.8.4 (rhbz#1529017)

---
 .gitignore   |  1 +
 jsoncpp.spec | 60 +++++++++++++++++++++++++++-------------------------
 sources      |  2 +-
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce5265d..da556b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ jsoncpp-src-0.6.0-rc2.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
diff --git a/jsoncpp.spec b/jsoncpp.spec
index 81fbe84..ae23baa 100644
--- a/jsoncpp.spec
+++ b/jsoncpp.spec
@@ -3,21 +3,16 @@
 
 %global jsondir json
 
-Name:       jsoncpp
-Version:    1.8.3
-Release:    1%{?dist}
-Summary:    JSON library implemented in C++
+Name:           jsoncpp
+Version:        1.8.4
+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
+License:        Public Domain or MIT
+URL:            https://github.com/open-source-parsers/%{name}
+Source0:        %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires:  cmake >= 3.1
-%if %{with jsoncpp_enables_doc}
-BuildRequires:  doxygen
-BuildRequires:  graphviz
-BuildRequires:  hardlink
-%endif
 BuildRequires:  python3-devel
 
 %description
@@ -27,20 +22,25 @@ It is easy for humans to read and write. It is easy for machines to parse and
 generate.
 
 
-%package devel
-Summary:    Development headers and library for %{name}
-Requires:   %{name}%{?_isa} = %{version}-%{release}
+%package        devel
+Summary:        Development headers and library for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description devel
+%description    devel
 This package contains the development headers and library for %{name}.
 
 
 %if %{with jsoncpp_enables_doc}
-%package doc
-Summary:    Documentation for %{name}
-BuildArch:  noarch
+%package        doc
+Summary:        Documentation for %{name}
 
-%description doc
+BuildRequires:  doxygen
+BuildRequires:  graphviz
+BuildRequires:  hardlink
+
+BuildArch:      noarch
+
+%description    doc
 This package contains the documentation for %{name}.
 %endif
 
@@ -64,7 +64,6 @@ pushd %{_target_platform}
        -DPYTHON_EXECUTABLE="%{__python3}"     \
        ..
 popd
-
 %make_build -C %{_target_platform}
 
 %if %{with jsoncpp_enables_doc}
@@ -76,12 +75,12 @@ popd
 %install
 %make_install -C %{_target_platform}
 
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -pm 0644 README.md %{buildroot}%{_docdir}/%{name}
+
 %if %{with jsoncpp_enables_doc}
 mkdir -p %{buildroot}%{_docdir}/%{name}/html
-for f in README.md ; do
-    install -p -m 0644 $f %{buildroot}%{_docdir}/%{name}
-done
-install -p -m 0644 dist/doxygen/*/*.{html,png} %{buildroot}%{_docdir}/%{name}/html
+install -pm 0644 dist/doxygen/*/*.{html,png} %{buildroot}%{_docdir}/%{name}/html
 hardlink -cfv %{buildroot}%{_docdir}/%{name}
 %endif
 
@@ -96,9 +95,9 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name}
 
 %files
 %license AUTHORS LICENSE
-%if %{with jsoncpp_enables_doc}
 %doc %dir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/README.md
+%if %{with jsoncpp_enables_doc}
 %exclude %{_docdir}/%{name}/html
 %endif
 %{_libdir}/lib%{name}.so.*
@@ -108,17 +107,20 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name}
 %{_libdir}/lib%{name}.so
 %{_includedir}/%{jsondir}
 %{_libdir}/cmake/*
-%{_libdir}/pkgconfig/jsoncpp.pc
+%{_libdir}/pkgconfig/%{name}.pc
 
 
 %if %{with jsoncpp_enables_doc}
 %files doc
-%license %{_datadir}/licenses/%{name}*
-%doc %{_docdir}/%{name}*
+%license %{_datadir}/licenses/%{name}
+%doc %{_docdir}/%{name}
 %endif
 
 
 %changelog
+* Tue Dec 26 2017 Björn Esser <besser82@fedoraproject.org> - 1.8.4-1
+- Update to version 1.8.4 (rhbz#1529017)
+
 * Tue Aug 29 2017 Björn Esser <besser82@fedoraproject.org> - 1.8.3-1
 - Update to version 1.8.3 (rhbz#1485908)
 
diff --git a/sources b/sources
index 52c9447..653592d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jsoncpp-1.8.3.tar.gz) = a5170ccbc440c1bd2b365e34f7367a55731d4fa86b2d323d11431cead771127364bad9d8e2e59dcbe41bc111d11a5da94988dec5e40b9119f793f43e487d7429
+SHA512 (jsoncpp-1.8.4.tar.gz) = f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1