From b536711dd42b02be419e632895a1d42646a9ad49 Mon Sep 17 00:00:00 2001
From: Björn Esser <besser82@fedoraproject.org>
Date: Jan 14 2018 22:02:24 +0000
Subject: Update patch for jsoncpp-1.8.4 with upstreamed version

Fix warnings when building local srpm

---

diff --git a/paraview-5.4.1-jsoncpp_184.patch b/paraview-5.4.1-jsoncpp_184.patch
index 24c5f09..c82490b 100644
--- a/paraview-5.4.1-jsoncpp_184.patch
+++ b/paraview-5.4.1-jsoncpp_184.patch
@@ -1,5 +1,13 @@
+commit d0a81cb5385bc6ec44b030ef98678be341d17c5e
+Author: Björn Esser <besser82@fedoraproject.org>
+Date:   Sun Jan 14 22:36:53 2018 +0100
+
+    vtkSMSettings: Fix build with jsoncpp-1.8.4
+    
+    Fixes #17909
+
 diff --git a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
-index b6e2b5592a..1fb2f03a07 100644
+index b6e2b5592a..22ac8da5d9 100644
 --- a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
 +++ b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
 @@ -788,7 +788,9 @@ public:
@@ -7,9 +15,9 @@ index b6e2b5592a..1fb2f03a07 100644
          if (lowerPriorityValue.isNull())
          {
 -          if (!proxyValue.removeMember(property->GetXMLName()).isNull())
-+          Json::Value& removedValue = Json::objectValue;
-+          proxyValue.removeMember(property->GetXMLName(), &removedValue);
-+          if (!removedValue.isNull())
++          Json::Value& removedValue;
++          if (proxyValue.removeMember(property->GetXMLName(), &removedValue) &&
++            !removedValue.isNull())
            {
              this->Modified();
            }
diff --git a/paraview.spec b/paraview.spec
index fb5c7e5..ffa8889 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -51,7 +51,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        8%{?relsuf}%{?dist}
+Release:        9%{?relsuf}%{?dist}
 Summary:        Parallel visualization application
 
 License:        BSD
@@ -59,7 +59,8 @@ URL:            http://www.paraview.org/
 Source0:        http://www.paraview.org/files/v%{pv_majmin}/ParaView-v%{version}%{?versuf}.tar.gz
 Source1:        paraview.xml
 
-# Fix for jsoncpp-1.8.4
+# Fix for jsoncpp-1.8.4.  Upstreamed:
+# https://gitlab.kitware.com/paraview/paraview/merge_requests/2147
 Patch0:         paraview-5.4.1-jsoncpp_184.patch
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
@@ -120,7 +121,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib
 %endif
 
-Requires:       hdf5 = %{_hdf5_version}
+Requires:       hdf5%{?_hdf5_version: = %{_hdf5_version}}
 Requires:       %{name}-data = %{version}-%{release}
 Requires:       python-pygments
 Requires:       python-six
@@ -185,7 +186,7 @@ Provides: bundled(xdmf2)
 
 # We want to build with a system vtk someday, but it doesn't work yet
 # -DUSE_EXTERNAL_VTK:BOOL=ON \\\
-# -DVTK_DIR=%{_libdir}/vtk \\\
+# -DVTK_DIR=%%{_libdir}/vtk \\\
 
 %global paraview_cmake_options \\\
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\
@@ -603,6 +604,10 @@ update-mime-database \
 
 
 %changelog
+* Sun Jan 14 2018 Björn Esser <besser82@fedoraproject.org> - 5.4.1-9
+- Update patch for jsoncpp-1.8.4 with upstreamed version
+- Fix warnings when building local srpm
+
 * Sun Jan 14 2018 Björn Esser <besser82@fedoraproject.org> - 5.4.1-8
 - Add patch to fix build with jsoncpp-1.8.4