Accepting request 653556 from home:openfoam:branches:science

- Update to version 5.6.0
  https://blog.kitware.com/paraview-5-6-0-release-notes/
- add devel package
- remove Tk build requirement and adjust description since ParaView
  hasn't used Tcl/Tk for quite a few years.
- ParaViewTutorial file not updated and not available on upstream
- drop patches already applied upstream
  * paraview-pythonqt-build-fix.patch
  * fix-hdf5-gcc8.patch
  * fix-qt-5.11-931c779.patch
  * fix-no-plugin-doc-dir.patch
- modify partially applied patches
  * paraview-find-qhelpgenerator-qt5.patch

OBS-URL: https://build.opensuse.org/request/show/653556
OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=58

ParaView-v5.5.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:64561f34c4402b88f3cb20a956842394dde5838efd7ebb301157a837114a0e2d
-size 51418473

ParaView-v5.6.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb8c4d752ad9805c74b4a08f8ae6e83402c3f11e38b274dba171b99bb6ac2460
+size 54085457

ParaViewTutorial-5.5.2.pdf

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea9c3fd9d25200488632e786130e3d197aebcad32c97c4e9bd1f111bb428ef55
-size 45113256

fix-hdf5-gcc8.patch

@@ -1,128 +0,0 @@
-From 06707a314646873b3bf6c6ef80ab2fd0fd721b72 Mon Sep 17 00:00:00 2001
-From: HDF Upstream <kwrobot@kitware.com>
-Date: Mon, 4 Jun 2018 10:00:49 -0400
-Subject: [PATCH] hdf5 2018-06-04 (247b2ae5)
-
-Code extracted from:
-
-    https://gitlab.kitware.com/third-party/hdf5.git
-
-at commit 247b2ae5487f2e3f2fb4f0dc9332abed128e5be2 (for/vtk-old).
----
- VTK/ThirdParty/hdf5/vtkhdf5/src/H5detect.c | 40 ++++++++++++++++++++--------------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/VTK/ThirdParty/hdf5/vtkhdf5/src/H5detect.c b/VTK/ThirdParty/hdf5/vtkhdf5/src/H5detect.c
-index b2c958e5c4b..5585d67632e 100644
---- a/VTK/ThirdParty/hdf5/vtkhdf5/src/H5detect.c
-+++ b/VTK/ThirdParty/hdf5/vtkhdf5/src/H5detect.c
-@@ -1360,8 +1360,8 @@ bit.\n";
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C89_integers(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C89_integers(void)
- {
-     DETECT_BYTE(signed char,	  SCHAR,        d_g[nd_g]); nd_g++;
-     DETECT_BYTE(unsigned char,	  UCHAR,        d_g[nd_g]); nd_g++;
-@@ -1388,8 +1388,8 @@ detect_C89_integers(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C89_floats(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C89_floats(void)
- {
-     DETECT_F(float,     FLOAT,      d_g[nd_g]); nd_g++;
-     DETECT_F(double,    DOUBLE,     d_g[nd_g]); nd_g++;
-@@ -1410,8 +1410,8 @@ detect_C89_floats(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C99_integers8(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C99_integers8(void)
- {
- #if H5_SIZEOF_INT8_T>0
-   #if H5_SIZEOF_INT8_T==1
-@@ -1472,8 +1472,8 @@ detect_C99_integers8(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C99_integers16(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C99_integers16(void)
- {
- #if H5_SIZEOF_INT16_T>0
-     DETECT_I(int16_t, 		  INT16,        d_g[nd_g]); nd_g++;
-@@ -1510,8 +1510,8 @@ detect_C99_integers16(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C99_integers32(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C99_integers32(void)
- {
- #if H5_SIZEOF_INT32_T>0
-     DETECT_I(int32_t, 		  INT32,        d_g[nd_g]); nd_g++;
-@@ -1548,8 +1548,8 @@ detect_C99_integers32(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C99_integers64(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C99_integers64(void)
- {
- #if H5_SIZEOF_INT64_T>0
-     DETECT_I(int64_t, 		  INT64,        d_g[nd_g]); nd_g++;
-@@ -1599,8 +1599,8 @@ detect_C99_integers64(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C99_integers(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C99_integers(void)
- {
-     /* break it down to more subroutines so that each module subroutine */
-     /* is smaller and takes less time to compile with optimization on.  */
-@@ -1625,8 +1625,8 @@ detect_C99_integers(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C99_floats(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C99_floats(void)
- {
- #if H5_SIZEOF_DOUBLE == H5_SIZEOF_LONG_DOUBLE
-     /*
-@@ -1656,8 +1656,8 @@ detect_C99_floats(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_alignments(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_alignments(void)
- {
-     /* Detect structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */
-     DETECT_M(void *,              POINTER,      m_g[na_g]); na_g++;
-@@ -1744,8 +1744,8 @@ static int verify_signal_handlers(int signum, void (*handler)(int))
-  *
-  *-------------------------------------------------------------------------
-  */
--int
--main(void) HDF_NO_UBSAN
-+int HDF_NO_UBSAN
-+main(void)
- {
- 
- #if defined(H5_HAVE_SETSYSINFO) && defined(SSI_NVPAIRS)

fix-no-plugin-doc-dir.patch

@@ -1,10 +0,0 @@
---- a/Plugins/StreamLinesRepresentation/CMakeLists.txt
-+++ b/Plugins/StreamLinesRepresentation/CMakeLists.txt
-@@ -41,7 +41,6 @@
- 
- add_paraview_plugin(
-   StreamLinesRepresentation "0.1"
--  DOCUMENTATION_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc"
-   SERVER_MANAGER_XML StreamLinesRepresentation.xml
-   SERVER_MANAGER_SOURCES
-     vtkStreamLinesRepresentation.cxx

fix-qt-5.11-931c779.patch

@@ -1,143 +0,0 @@
-From 931c779dde8460fe32aa8a3d19956b175b96e4f9 Mon Sep 17 00:00:00 2001
-From: Robert O'Bara <bob.obara@kitware.com>
-Date: Thu, 24 May 2018 09:49:28 -0400
-Subject: [PATCH] ENH: Changes needed to support Qt 5.11
-
-Basically needed to add missing header files.
----
- Plugins/SLACTools/pqSLACDataLoadManager.cxx                     | 1 +
- Qt/ApplicationComponents/pqColorMapEditor.cxx                   | 1 +
- Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx  | 1 +
- .../pqStandardViewFrameActionsImplementation.cxx                | 1 +
- Qt/ApplicationComponents/pqTimeInspectorWidget.cxx              | 1 +
- .../pqTransferFunctionWidgetPropertyDialog.cxx                  | 2 ++
- Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx     | 1 +
- Qt/Components/pqChangeInputDialog.cxx                           | 1 +
- Qt/Components/pqCinemaTrackSelection.cxx                        | 1 +
- Qt/Python/pqPythonShell.cxx                                     | 1 +
- 10 files changed, 11 insertions(+)
-
-diff --git a/Plugins/SLACTools/pqSLACDataLoadManager.cxx b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
-index 3ba019c26b..ce38396f68 100644
---- a/Plugins/SLACTools/pqSLACDataLoadManager.cxx
-+++ b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
-@@ -34,6 +34,7 @@
- #include "vtkSMProperty.h"
- #include "vtkSMSourceProxy.h"
- 
-+#include <QAction>
- #include <QPushButton>
- #include <QtDebug>
- 
-diff --git a/Qt/ApplicationComponents/pqColorMapEditor.cxx b/Qt/ApplicationComponents/pqColorMapEditor.cxx
-index 0395185e0a..88b56745eb 100644
---- a/Qt/ApplicationComponents/pqColorMapEditor.cxx
-+++ b/Qt/ApplicationComponents/pqColorMapEditor.cxx
-@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <QDebug>
- #include <QKeyEvent>
- #include <QPointer>
-+#include <QStyle>
- #include <QVBoxLayout>
- 
- class pqColorMapEditor::pqInternals
-diff --git a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
-index 908e4598e0..820361a2b3 100644
---- a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
-+++ b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
-@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkSMUncheckedPropertyHelper.h"
- 
- #include <QGridLayout>
-+#include <QStyle>
- 
- class pqDoubleRangeSliderPropertyWidget::pqInternals
- {
-diff --git a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
-index c297dc3d9e..501633f63a 100644
---- a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
-+++ b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
-@@ -69,6 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <QPushButton>
- #include <QSet>
- #include <QShortcut>
-+#include <QStyle>
- 
- //-----------------------------------------------------------------------------
- pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation(
-diff --git a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
-index 6774c2e48e..e85e614f04 100644
---- a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
-+++ b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
-@@ -49,6 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkSMPropertyHelper.h"
- #include "vtkSMSourceProxy.h"
- 
-+#include <QHeaderView>
- #include <QLineF>
- #include <QPainter>
- #include <QVariant>
-diff --git a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
-index 55d3146447..93cd995d92 100644
---- a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
-+++ b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
-@@ -36,6 +36,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkPiecewiseFunction.h"
- #include <QString>
- 
-+#include <QDoubleValidator>
-+
- class pqTransferFunctionWidgetPropertyDialog::pqInternals
- {
- public:
-diff --git a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
-index 6d2865431e..8d2c4b61cd 100644
---- a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
-+++ b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
-@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkSMProxy.h"
- 
- #include <QIntValidator>
-+#include <QStyle>
- 
- class pqViewResolutionPropertyWidget::pqInternals
- {
-diff --git a/Qt/Components/pqChangeInputDialog.cxx b/Qt/Components/pqChangeInputDialog.cxx
-index 8a67b10095..86db3de01c 100644
---- a/Qt/Components/pqChangeInputDialog.cxx
-+++ b/Qt/Components/pqChangeInputDialog.cxx
-@@ -45,6 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkSMProxy.h"
- #include "vtkSmartPointer.h"
- 
-+#include <QHeaderView>
- #include <QItemSelectionModel>
- #include <QLineEdit>
- #include <QRadioButton>
-diff --git a/Qt/Components/pqCinemaTrackSelection.cxx b/Qt/Components/pqCinemaTrackSelection.cxx
-index 3d6d9dde19..eea2e37680 100644
---- a/Qt/Components/pqCinemaTrackSelection.cxx
-+++ b/Qt/Components/pqCinemaTrackSelection.cxx
-@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- ========================================================================*/
- #include <QDebug>
-+#include <QHeaderView>
- 
- #include "vtkPVArrayInformation.h"
- #include "vtkPVDataInformation.h"
-diff --git a/Qt/Python/pqPythonShell.cxx b/Qt/Python/pqPythonShell.cxx
-index 3d01fd0a96..bc1a014936 100644
---- a/Qt/Python/pqPythonShell.cxx
-+++ b/Qt/Python/pqPythonShell.cxx
-@@ -52,6 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkStringOutputWindow.h"
- #include "vtkWeakPointer.h"
- 
-+#include <QAbstractItemView>
- #include <QApplication>
- #include <QCursor>
- #include <QFile>
--- 
-2.17.1
-

paraview-find-qhelpgenerator-qt5.patch

@@ -1,7 +1,7 @@
-Index: ParaView-v5.3.0/CMake/ParaViewMacros.cmake
+Index: ParaView-v5.6.0/CMake/ParaViewMacros.cmake
 ===================================================================
---- ParaView-v5.3.0.orig/CMake/ParaViewMacros.cmake
+--- ParaView-v5.6.0.orig/CMake/ParaViewMacros.cmake
-+++ ParaView-v5.3.0/CMake/ParaViewMacros.cmake
++++ ParaView-v5.6.0/CMake/ParaViewMacros.cmake
 @@ -259,7 +259,7 @@
    endif()
  
@@ -11,12 +11,3 @@ Index: ParaView-v5.3.0/CMake/ParaViewMacros.cmake
      HINTS "${qt_binary_dir_hints}"
      DOC "xmlpatterns used to generate html from Proxy documentation.")
    mark_as_advanced(QT_XMLPATTERNS_EXECUTABLE)
-@@ -354,7 +354,7 @@
-   endif()
- 
-   find_program(QT_HELP_GENERATOR
--    qhelpgenerator
-+    NAMES qhelpgenerator qhelpgenerator-qt5
-     HINTS "${qt_binary_dir_hints}"
-     DOC "qhelpgenerator used to compile Qt help project files")
-   mark_as_advanced(QT_HELP_GENERATOR)

paraview-pythonqt-build-fix.patch

@@ -1,22 +0,0 @@
-From 1cdde87a94d4282279337a9e7079f34d7a9b64cf Mon Sep 17 00:00:00 2001
-From: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
-Date: Thu, 17 Nov 2016 11:07:35 -0500
-Subject: [PATCH] Fix build issues with PythonQtPlugin.
-
----
- Plugins/PythonQtPlugin/CMakeLists.txt | 14 +++-----------
- 1 file changed, 3 insertions(+), 11 deletions(-)
-
-Index: ParaView-v5.4.0/Plugins/PythonQtPlugin/CMakeLists.txt
-===================================================================
---- ParaView-v5.4.0.orig/Plugins/PythonQtPlugin/CMakeLists.txt
-+++ ParaView-v5.4.0/Plugins/PythonQtPlugin/CMakeLists.txt
-@@ -44,6 +44,8 @@ add_paraview_auto_start(
-   OUTSRCS
-   CLASS_NAME pqPythonQtPlugin)
- 
-+include(ParaViewQt)
-+pv_find_package_qt(qt_targets REQUIRED QT4_COMPONENTS QtGui QT5_COMPONENTS Widgets)
- 
- add_paraview_plugin(PythonQtPlugin "1.0"
-                     GUI_INTERFACES ${OUTIFACES}

paraview-rpmlintrc

@@ -7,3 +7,4 @@ addFilter("no-manual-page-for-binary")
 
 # The hidden .plugin file is really needed
 addFilter("hidden-file-or-dir .*/usr/lib64/paraview/.plugins")
+addFilter("hidden-file-or-dir .*/usr/lib64/paraview*/.plugins")

paraview.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Nov 29 12:00:02 CET 2018 - Mark.Olesen@esi-group.com
+
+- Update to version 5.6.0
+  https://blog.kitware.com/paraview-5-6-0-release-notes/
+- add devel package
+- remove Tk build requirement and adjust description since ParaView
+  hasn't used Tcl/Tk for quite a few years.
+- ParaViewTutorial file not updated and not available on upstream
+- drop patches already applied upstream
+  * paraview-pythonqt-build-fix.patch
+  * fix-hdf5-gcc8.patch
+  * fix-qt-5.11-931c779.patch
+  * fix-no-plugin-doc-dir.patch
+- modify partially applied patches
+  * paraview-find-qhelpgenerator-qt5.patch
+
 -------------------------------------------------------------------
 Tue Aug 14 12:36:23 UTC 2018 - foss@grueninger.de
 

paraview.spec

@@ -15,20 +15,19 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define major_ver 5.5
+
+%define major_ver 5.6
 Name:           paraview
-Version:        5.5.2
+Version:        5.6.0
 Release:        0
 Summary:        Data analysis and visualization application
 License:        BSD-3-Clause
 Group:          Productivity/Scientific/Physics
 Url:            http://www.paraview.org
 Source0:        http://www.paraview.org/files/v%{major_ver}/ParaView-v%{version}.tar.gz
-
 Source1:        %{name}-rpmlintrc
 Source2:        http://www.paraview.org/files/v%{major_ver}/ParaViewGettingStarted-%{version}.pdf
 Source3:        http://www.paraview.org/files/v%{major_ver}/ParaViewGuide-%{version}.pdf
-Source4:        http://www.paraview.org/files/v%{major_ver}/ParaViewTutorial-%{version}.pdf
 # PATCH-FIX-UPSTREAM paraview-desktop-entry-fix.patch badshah400@gmail.com -- Fix desktop menu entry by inserting proper required categories
 Patch1:         paraview-desktop-entry-fix.patch
 # PATCH-FIX-UPSTREAM paraview-fix-file-contains-date-time.patch badshah400@gmail.com -- Remove reference to __DATE__ and __TIME__ from source
@@ -37,18 +36,10 @@ Patch2:         paraview-fix-file-contains-date-time.patch
 Patch3:         paraview-do-not-install-missing-vtk-doxygen-dir.patch
 # PATCH-FIX-UPSTREAM paraview-find-qhelpgenerator-qt5.patch badshah400@gmail.com -- Help find qhelpgenerator-qt5 instead of qhelpgenerator when Qt5 is used
 Patch4:         paraview-find-qhelpgenerator-qt5.patch
-# PATCH-FIX-UPSTREAM paraview-pythonqt-build-fix.patch badshah400@gmail.com -- Fix build issues with PythonQtPlugin; patch taken from upstream.
-Patch5:         paraview-pythonqt-build-fix.patch
-# PATCH-FIX-UPSTREAM fix-qt-5.11-931c779.patch -- Required includes for Qt 5.11; from upstream, will be part of ParaView 5.6
-Patch6:         fix-qt-5.11-931c779.patch
-# PATCH-FIX-UPSTREAM fix-hdf5-gcc8.patch -- Adjustments required to work with GCC 8; from upstream, might be part of ParaView 5.6
-Patch7:         fix-hdf5-gcc8.patch
 # PATCH-FIX-OPENSUSE fix-libharu-missing-m.patch -- missing libraries for linking
 Patch8:         fix-libharu-missing-m.patch
 # PATCH-FIX-OPENSUSE fix-libhdf5-missing-m.patch -- missing libraries for linking
 Patch9:         fix-libhdf5-missing-m.patch
-# PATCH-FIX-UPSTREAM fix-no-plugin-doc-dir.patch -- plugin does not contain doc dir
-Patch10:        fix-no-plugin-doc-dir.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  boost-devel
 BuildRequires:  cmake >= 3.3
@@ -58,8 +49,6 @@ BuildRequires:  gnuplot
 BuildRequires:  graphviz
 BuildRequires:  libexpat-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(xt)
 BuildRequires:  libpqxx-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  openssl-devel
@@ -67,11 +56,16 @@ BuildRequires:  python-Sphinx
 BuildRequires:  python-devel
 BuildRequires:  python-matplotlib
 BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(xt)
 %py_requires
 BuildRequires:  fdupes
+BuildRequires:  python-qt5-devel
 BuildRequires:  python-twisted
 BuildRequires:  python-zope.interface
-BuildRequires:  python-qt5-devel
+BuildRequires:  readline-devel
+BuildRequires:  wget
+BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Help)
@@ -82,10 +76,6 @@ BuildRequires:  pkgconfig(Qt5WebKitWidgets)
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5X11Extras)
 BuildRequires:  pkgconfig(Qt5Xml)
-BuildRequires:  readline-devel
-BuildRequires:  tk-devel
-BuildRequires:  wget
-BuildRequires:  zlib-devel
 Requires:       gnuplot
 Requires:       graphviz
 Requires:       python
@@ -97,26 +87,33 @@ ExcludeArch:    %ix86
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-ParaView is an application for visualizing large data sets.
+ParaView is an open-source, multi-platform data analysis and visualization
+application for visualizing large data sets.
 
-ParaView runs on distributed and shared memory systems alike. It uses the
+ParaView runs on distributed and shared memory systems alike. It uses VTK
-Visualization Toolkit as the data processing and rendering engine, and has a
+(the Visualization Toolkit) as the data processing and rendering engine.
-user interface written using a blend of Tcl/Tk and C++.
+Data exploration can be done interactively in 3D or programmatically using
+batch processing.
 
 NOTE: The version in this package has NOT been compiled with MPI support.
 
+%package        devel
+Summary:        Headers for building ParaView plugins or embedding Catalyst
+Group:          Development/Libraries/Other
+Requires:       %{name} = %{version}
+
+%description    devel
+This package contains headers and libraries required to build plugins
+for ParaView or to embed ParaView Catalyst in a simulation program.
+
 %prep
 %setup -q -n ParaView-v%{version}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 
 %build
 # Prepare for gcc 4.9.0: work around gcc 4.9.0 regression
@@ -127,9 +124,9 @@ export CC='gcc'
 export CXX='g++'
 
 %cmake  -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/%{name} \
-        -DVTK_INSTALL_INCLUDE_DIR:PATH=include/%{name} \
         -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/%{name} \
         -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/%{name} \
+        -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{name}-%{major_ver} \
         -DVTK_INSTALL_DATA_DIR=share/%{name} \
         -DVTK_INSTALL_DOC_DIR=share/doc/packages/%{name} \
         -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \
@@ -154,7 +151,9 @@ export CXX='g++'
         -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF \
         -DBUILD_DOCUMENTATION:BOOL=ON \
         -DBUILD_EXAMPLES:BOOL=OFF \
-        -DBUILD_TESTING:BOOL=OFF
+        -DBUILD_TESTING:BOOL=OFF \
+        -DQtTesting_INSTALL_NO_DEVELOPMENT:BOOL=ON \
+        -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON
 
 # FIXME: TURN ON WHEN UPDATED GL2PS > 1.3.9 IS RELEASED
 #       -DVTK_USE_SYSTEM_GL2PS:BOOL=ON \
@@ -181,7 +180,6 @@ rm -fr %{buildroot}%{_libexecdir}/libFmmMesh.a
 # INSTALL DOCUMENTATION USED BY THE HELP MENU IN MAIN APP
 install -Dm0644 %{S:2} %{buildroot}%{_datadir}/%{name}-%{major_ver}/doc/GettingStarted.pdf
 install -Dm0644 %{S:3} %{buildroot}%{_datadir}/%{name}-%{major_ver}/doc/Guide.pdf
-install -Dm0644 %{S:4} %{buildroot}%{_datadir}/%{name}-%{major_ver}/doc/Tutorial.pdf
 
 %fdupes %{buildroot}/
 
@@ -198,8 +196,13 @@ install -Dm0644 %{S:4} %{buildroot}%{_datadir}/%{name}-%{major_ver}/doc/Tutorial
 %files
 %defattr(-,root,root)
 %doc License_v1.2.txt
+
+%exclude %{_bindir}/smTest*
+%exclude %{_bindir}/vtk*
+%exclude %{_includedir}/
+%exclude %{_libdir}/cmake/
+
 %{_libdir}/%{name}/
-%{_includedir}/%{name}/
 %{_bindir}/*
 %{_docdir}/%{name}/
 %{_datadir}/%{name}-%{major_ver}/
@@ -208,4 +211,11 @@ install -Dm0644 %{S:4} %{buildroot}%{_datadir}/%{name}-%{major_ver}/doc/Tutorial
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
+%files devel
+%defattr(-,root,root)
+%{_bindir}/smTest*
+%{_bindir}/vtk*
+%{_includedir}/%{name}*
+%{_libdir}/cmake/%{name}-%{major_ver}/
+
 %changelog