From 9b0a1fd0d6fb0c28787e0e13cbac9b3188249c6f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Feb 15 2019 14:47:49 +0000 Subject: Update to 5.6.0 Drop old Obsoletes/Provides Enable openmpi build for s390x Fix appdata install location Consolidate license and readmes into -data sub-package Move static libraries into -devel and provide -static --- diff --git a/.gitignore b/.gitignore index 659c48b..50be066 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ ParaView-3.8.1.tar.gz /ParaView-v5.5.0.tar.gz /ParaView-v5.5.1.tar.gz /ParaView-v5.5.2.tar.gz +/ParaView-v5.6.0.tar.gz diff --git a/2474.patch b/2474.patch deleted file mode 100644 index 963105a..0000000 --- a/2474.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 931c779dde8460fe32aa8a3d19956b175b96e4f9 Mon Sep 17 00:00:00 2001 -From: Robert O'Bara -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 - #include - #include - -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 - #include - #include -+#include - #include - - 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 -+#include - - 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 - #include - #include -+#include - - //----------------------------------------------------------------------------- - 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 - #include - #include - #include -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 - -+#include -+ - 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 -+#include - - 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 - #include - #include - #include -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 -+#include - - #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 - #include - #include - #include --- -2.17.1 - diff --git a/2647.patch b/2647.patch deleted file mode 100644 index afb28ee..0000000 --- a/2647.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f9c7e4b01341f45aec55f452b583c544e2557ca4 Mon Sep 17 00:00:00 2001 -From: Joachim Pouderoux -Date: Thu, 9 Aug 2018 11:07:54 -0400 -Subject: [PATCH] Fix StreamLinesRepresentation plugin documentation issue - ---- - Plugins/StreamLinesRepresentation/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Plugins/StreamLinesRepresentation/CMakeLists.txt b/Plugins/StreamLinesRepresentation/CMakeLists.txt -index 5d656a54b8..86c24964fe 100644 ---- a/Plugins/StreamLinesRepresentation/CMakeLists.txt -+++ b/Plugins/StreamLinesRepresentation/CMakeLists.txt -@@ -41,7 +41,6 @@ encode_files_as_strings(ENCODED_STRING_FILES - - add_paraview_plugin( - StreamLinesRepresentation "0.1" -- DOCUMENTATION_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc" - SERVER_MANAGER_XML StreamLinesRepresentation.xml - SERVER_MANAGER_SOURCES - vtkStreamLinesRepresentation.cxx --- -2.17.1 - diff --git a/FindPEGTL.cmake b/FindPEGTL.cmake new file mode 100644 index 0000000..28ae5c5 --- /dev/null +++ b/FindPEGTL.cmake @@ -0,0 +1,66 @@ +# - Try to find PEGTL lib +# +# This module supports requiring a minimum version, e.g. you can do +# find_package(PEGTL 3.1.2) +# to require version 3.1.2 or newer of PEGTL. +# +# Once done this will define +# +# PEGTL_FOUND - system has eigen lib with correct version +# PEGTL_INCLUDE_DIR - the eigen include directory +# PEGTL_VERSION - eigen version + +# Copyright (c) 2006, 2007 Montel Laurent, +# Copyright (c) 2008, 2009 Gael Guennebaud, +# Copyright (c) 2009 Benoit Jacob +# Redistribution and use is allowed according to the terms of the 2-clause BSD license. + +if(NOT PEGTL_FIND_VERSION) + if(NOT PEGTL_FIND_VERSION_MAJOR) + set(PEGTL_FIND_VERSION_MAJOR 2) + endif() + if(NOT PEGTL_FIND_VERSION_MINOR) + set(PEGTL_FIND_VERSION_MINOR 4) + endif() + if(NOT PEGTL_FIND_VERSION_PATCH) + set(PEGTL_FIND_VERSION_PATCH 0) + endif() + + set(PEGTL_FIND_VERSION "${PEGTL_FIND_VERSION_MAJOR}.${PEGTL_FIND_VERSION_MINOR}.${PEGTL_FIND_VERSION_PATCH}") +endif() + +macro(_pegtl_check_version) + file(READ "${PEGTL_INCLUDE_DIR}/tao/pegtl/version.hpp" _pegtl_version_header) + string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}") + set(PEGTL_VERSION ${CMAKE_MATCH_1}) + if(${PEGTL_VERSION} VERSION_LESS ${PEGTL_FIND_VERSION}) + set(PEGTL_VERSION_OK FALSE) + else() + set(PEGTL_VERSION_OK TRUE) + endif() + + if(NOT PEGTL_VERSION_OK) + message(STATUS "PEGTL version ${PEGTL_VERSION} found in ${PEGTL_INCLUDE_DIR}, " + "but at least version ${PEGTL_FIND_VERSION} is required") + endif() +endmacro() + +if (PEGTL_INCLUDE_DIR) + # in cache already + _pegtl_check_version() + set(PEGTL_FOUND ${PEGTL_VERSION_OK}) +else () + find_path(PEGTL_INCLUDE_DIR NAMES tao + PATHS + ${CMAKE_INSTALL_PREFIX}/include + ) + + if(PEGTL_INCLUDE_DIR) + _pegtl_check_version() + endif() + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(PEGTL DEFAULT_MSG PEGTL_INCLUDE_DIR PEGTL_VERSION_OK) + + mark_as_advanced(PEGTL_INCLUDE_DIR) +endif() diff --git a/paraview-metainfo.patch b/paraview-metainfo.patch new file mode 100644 index 0000000..1d2e391 --- /dev/null +++ b/paraview-metainfo.patch @@ -0,0 +1,11 @@ +diff -up ParaView-v5.6.0/Applications/ParaView/CMakeLists.txt.orig ParaView-v5.6.0/Applications/ParaView/CMakeLists.txt +--- ParaView-v5.6.0/Applications/ParaView/CMakeLists.txt.orig 2019-02-12 20:25:45.785665391 -0700 ++++ ParaView-v5.6.0/Applications/ParaView/CMakeLists.txt 2019-02-12 20:26:44.877398493 -0700 +@@ -164,6 +164,6 @@ elseif (UNIX) + endforeach () + install( + FILES paraview.appdata.xml +- DESTINATION share/appdata ++ DESTINATION share/metainfo + COMPONENT runtime) + endif() diff --git a/paraview-pegtl.patch b/paraview-pegtl.patch new file mode 100644 index 0000000..3dde917 --- /dev/null +++ b/paraview-pegtl.patch @@ -0,0 +1,12 @@ +diff -up ParaView-v5.6.0/VTK/IO/MotionFX/vtkMotionFXCFGGrammar.h.pegtl ParaView-v5.6.0/VTK/IO/MotionFX/vtkMotionFXCFGGrammar.h +--- ParaView-v5.6.0/VTK/IO/MotionFX/vtkMotionFXCFGGrammar.h.pegtl 2018-11-06 12:05:18.000000000 -0700 ++++ ParaView-v5.6.0/VTK/IO/MotionFX/vtkMotionFXCFGGrammar.h 2019-02-06 20:04:55.642987394 -0700 +@@ -22,7 +22,7 @@ + #include + + // for debugging +-#include ++#include + + namespace MotionFX + { diff --git a/paraview.spec b/paraview.spec index 8bf3b02..c862550 100644 --- a/paraview.spec +++ b/paraview.spec @@ -2,14 +2,11 @@ # https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 %global _python_bytecompile_extra 1 -%ifarch s390 s390x -%global build_openmpi 0 -%endif %{!?build_openmpi:%global build_openmpi 1} %{!?build_mpich:%global build_mpich 1} %global pv_maj 5 -%global pv_min 5 -%global pv_patch 2 +%global pv_min 6 +%global pv_patch 0 %global pv_majmin %{pv_maj}.%{pv_min} #global rcsuf rc3 %{?rcsuf:%global relsuf .%{rcsuf}} @@ -65,23 +62,24 @@ Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 21%{?relsuf}%{?dist} +Release: 1%{?relsuf}%{?dist} Summary: Parallel visualization application License: BSD 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 Qt 5.11 -Patch0: https://gitlab.kitware.com/paraview/paraview/merge_requests/2474.patch -# Fix for cmake 3.12 doc build -Patch1: https://gitlab.kitware.com/paraview/paraview/merge_requests/2647.patch +Source2: FindPEGTL.cmake +# Use system pegtl +Patch0: paraview-pegtl.patch +# Fix appdata install location +# https://gitlab.kitware.com/paraview/paraview/merge_requests/3014 +Patch1: paraview-metainfo.patch -%if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: cmake3 +%if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: qt-assistant %else -BuildRequires: cmake BuildRequires: qt-assistant-adp-devel %endif BuildRequires: lz4-devel @@ -96,7 +94,7 @@ BuildRequires: qt-devel BuildRequires: qt-webkit-devel %endif BuildRequires: mesa-libOSMesa-devel -BuildRequires: %{py2_prefix}-devel, tk-devel, hdf5-devel +BuildRequires: python2-devel, tk-devel, hdf5-devel BuildRequires: cgnslib-devel # Fails looking for PythonQt_QtBindings.h # https://gitlab.kitware.com/paraview/paraview/issues/17365 @@ -109,6 +107,7 @@ BuildRequires: openssl-devel BuildRequires: gnuplot BuildRequires: wget BuildRequires: boost-devel +BuildRequires: double-conversion-devel BuildRequires: eigen3-devel %if 0%{with gl2ps} BuildRequires: gl2ps-devel >= 1.3.8 @@ -124,6 +123,7 @@ BuildRequires: libpng-devel BuildRequires: libtheora-devel BuildRequires: libxml2-devel BuildRequires: netcdf-cxx-devel +BuildRequires: PEGTL-devel %if %{with protobuf} BuildRequires: protobuf-devel %endif @@ -140,17 +140,12 @@ BuildRequires: glibc-langpack-en Requires: hdf5%{?_hdf5_version: = %{_hdf5_version}} Requires: %{name}-data = %{version}-%{release} Requires: %{py2_prefix}-pygments -Requires: %{py2_prefix}-six -%{?fedora:Requires: python2-numpy} -%{?rhel:Requires: numpy} +Requires: python2-six +Requires: python2-numpy Requires: %{py2_prefix}-twisted Requires: %{py2_prefix}-autobahn Requires: qt5-qtx11extras%{?_isa} -Obsoletes: paraview-demos < 3.2.1-4 - -Provides: paraview-demos = %{version}-%{release} - # Bundled KWSys # https://fedorahosted.org/fpc/ticket/555 # Components used are specified in VTK/Utilities/KWSys/CMakeLists.txt @@ -249,7 +244,9 @@ Provides: bundled(xdmf2) -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \\\ -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \\\ -DHDF5_INCLUDE_DIRS:PATH=$MPI_INCLUDE \\\ - -DVTK_INSTALL_INCLUDE_DIR:PATH=include/paraview \\\ + -DINCLUDE_INSTALL_DIR:PATH=$MPI_INCLUDE/paraview \\\ + -DPYTHON_INSTALL_DIR=PATH=$MPI_PYTHON2_SITEARCH \\\ + -DVTK_INSTALL_INCLUDE_DIR:PATH=$MPI_INCLUDE/paraview \\\ -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib/paraview \\\ -DVTK_INSTALL_LIBRARY_DIR:PATH=lib/paraview \\\ -DVTK_USE_SYSTEM_DIY2=OFF \\\ @@ -304,6 +301,9 @@ Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: vtk-devel%{?_isa} +Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-static%{?_isa} = %{version}-%{release} + %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -315,16 +315,16 @@ Summary: Documentation files for ParaView BuildRequires: doxygen BuildRequires: graphviz BuildRequires: hardlink -BuildRequires: %{py2_prefix}-devel -%{?fedora:BuildRequires: python2-numpy} -%{?rhel:BuildRequires: numpy} -BuildRequires: %{py2_prefix}-sphinx +BuildRequires: python2-devel +BuildRequires: python2-numpy +BuildRequires: python2-sphinx # Unavailable on rhel BuildRequires: %{py2_prefix}-twisted BuildRequires: %{py2_prefix}-autobahn -BuildArch: noarch +# Doxygen builds are different between arches +#BuildArch: noarch %description doc %{summary}. @@ -341,16 +341,11 @@ BuildRequires: netcdf-openmpi-devel Requires: %{name}-data = %{version}-%{release} Requires: mpi4py-openmpi Requires: %{py2_prefix}-pygments -Requires: %{py2_prefix}-six -%{?fedora:Requires: python2-numpy} -%{?rhel:Requires: numpy} +Requires: python2-six +Requires: python2-numpy Requires: %{py2_prefix}-twisted Requires: %{py2_prefix}-autobahn -Obsoletes: %{name}-mpi < 3.6.2-5 - -Provides: %{name}-mpi = %{version}-%{release} - %description openmpi This package contains copies of the ParaView server binaries compiled with OpenMPI. These are named pvserver_openmpi, pvbatch_openmpi, etc. @@ -363,6 +358,9 @@ Summary: Development files for %{name}-openmpi Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} +Provides: %{name}-openmpi-static = %{version}-%{release} +Provides: %{name}-openmpi-static%{?_isa} = %{version}-%{release} + %description openmpi-devel The %{name}-openmpi-devel package contains libraries and header files for developing applications that use %{name}-openmpi. @@ -380,14 +378,11 @@ BuildRequires: netcdf-mpich-devel Requires: %{name}-data = %{version}-%{release} Requires: mpi4py-mpich Requires: %{py2_prefix}-pygments -Requires: %{py2_prefix}-six -%{?fedora:Requires: python2-numpy} -%{?rhel:Requires: numpy} +Requires: python2-six +Requires: python2-numpy Requires: %{py2_prefix}-twisted Requires: %{py2_prefix}-autobahn -Obsoletes: %{name}-mpich2 < 3.98.1-6 - %description mpich This package contains copies of the ParaView server binaries compiled with mpich. These are named pvserver_mpich, pvbatch_mpich, etc. @@ -400,9 +395,8 @@ Summary: Development files for %{name}-mpich Requires: %{name}-mpich%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-mpich2-devel < 3.98.1-6 - -Provides: %{name}-mpich2-devel = %{version}-%{release} +Provides: %{name}-mpich-static = %{version}-%{release} +Provides: %{name}-mpich-static%{?_isa} = %{version}-%{release} %description mpich-devel The %{name}-mpich-devel package contains libraries and header files for @@ -430,7 +424,7 @@ done %if %{system_pugixml} rm ThirdParty/pugixml/pugixml.* %endif -for x in vtkeigen vtkexpat vtkfreetype %{?_with_gl2ps:vtkgl2ps} vtkhdf5 vtkjpeg vtklibxml2 vtklz4 vtklzma vtkmpi4py vtknetcdf{,cpp} vtkogg vtktheora vtkpng vtksqlite vtktiff vtkzlib +for x in vtk{doubleconversion,eigen,expat,freetype,%{?_with_gl2ps:gl2ps,}hdf5,jpeg,libxml2,lz4,lzma,mpi4py,netcdf{,cpp},ogg,pegtl,png,sqlite,theora,tiff,zlib} do rm -r VTK/ThirdParty/*/${x} done @@ -440,13 +434,14 @@ rm -r VTK/ThirdParty/jsoncpp/vtkjsoncpp %endif # Remove unused KWSys items find VTK/Utilities/KWSys/vtksys/ -name \*.[ch]\* | grep -vE '^VTK/Utilities/KWSys/vtksys/([a-z].*|Configure|SharedForward|String\.hxx|Base64|CommandLineArguments|Directory|DynamicLoader|Encoding|FStream|FundamentalType|Glob|MD5|Process|RegularExpression|System|SystemInformation|SystemTools)(C|CXX|UNIX)?\.' | xargs rm +cp %SOURCE2 VTK/CMake/FindPEGTL.cmake # We want to build with a system vtk someday, but it doesn't work yet #rm -r VTK %build mkdir %{_target_platform} pushd %{_target_platform} -%cmake3 .. \ +%cmake3 -Wno-dev .. \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/paraview \ -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/paraview \ @@ -468,7 +463,7 @@ popd mkdir %{_target_platform}-openmpi pushd %{_target_platform}-openmpi %{_openmpi_load} -%cmake3 .. \ +%cmake3 -Wno-dev .. \ %{paraview_cmake_mpi_options} # Fixup forward paths sed -i -e 's,../%{_lib}/openmpi,..,' `find -name \*-forward.c` @@ -483,7 +478,7 @@ pushd %{_target_platform}-mpich # EL7 mpich module doesn't set PYTHONPATH # https://bugzilla.redhat.com/show_bug.cgi?id=1148992 [ -z "$PYTHONPATH" ] && export PYTHONPATH=$MPI_PYTHON_SITEARCH -%cmake3 .. \ +%cmake3 -Wno-dev .. \ %{paraview_cmake_mpi_options} # Fixup forward paths sed -i -e 's,../%{_lib}/mpich,..,' `find -name \*-forward.c` @@ -509,7 +504,7 @@ install -m644 %SOURCE1 %{buildroot}%{_datadir}/mime/packages %make_install -C %{_target_platform}-openmpi #Remove mpi copy of doc and man pages and data -rm -rf %{buildroot}%{_libdir}/openmpi/share/{appdata,applications,doc,icons,man,paraview,vtkm-*} +rm -rf %{buildroot}%{_libdir}/openmpi/share/{applications,doc,icons,man,mimeinfo,paraview,vtkm-*} # Fix shell script permissions chmod 0755 %{buildroot}%{_libdir}/openmpi/share/cmake/paraview/pre-commit @@ -523,7 +518,7 @@ chmod 0755 %{buildroot}%{_libdir}/openmpi/share/cmake/paraview/pre-commit %make_install -C %{_target_platform}-mpich #Remove mpi copy of doc and man pages and data -rm -rf %{buildroot}%{_libdir}/mpich/share/{appdata,applications,doc,icons,man,paraview,vtkm-*} +rm -rf %{buildroot}%{_libdir}/mpich/share/{applications,doc,icons,man,mimeinfo,paraview,vtkm-*} # Fix shell script permissions chmod 0755 %{buildroot}%{_libdir}/mpich/share/cmake/paraview/pre-commit @@ -535,7 +530,7 @@ chmod 0755 %{buildroot}%{_libdir}/mpich/share/cmake/paraview/pre-commit desktop-file-validate %{buildroot}%{_datadir}/applications/paraview.desktop %if 0%{?fedora} || 0%{?rhel} >= 8 -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml %endif #Cleanup only vtk conflicting binaries @@ -551,6 +546,7 @@ find %{buildroot} -name VTKConfig.cmake | xargs sed -i -e '/builddir/s/^/#/' # Build autodocs and move documentation-files to proper location mkdir -p %{buildroot}%{_pkgdocdir} install -pm 0644 README.md %{buildroot}%{_pkgdocdir} +install -pm 0644 Utilities/VisItBridge/README-VisItBridge.md %{buildroot}%{_pkgdocdir} mv %{buildroot}%{_docdir}/paraview-%{pv_majmin}/* %{buildroot}%{_pkgdocdir} rm -rf %{buildroot}%{_docdir}/paraview-%{pv_majmin} find %{buildroot}%{_pkgdocdir} -name '.*' -print0 | xargs -0 rm -frv @@ -589,10 +585,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %endif %files -%license Copyright.txt License_v1.2.txt -%doc %dir %{_pkgdocdir} -%doc %{_pkgdocdir}/README.md -%doc Utilities/VisItBridge/README-VisItBridge.md %{_bindir}/paraview %{_bindir}/pvbatch # Currently disabled upstream @@ -603,9 +595,14 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_bindir}/pvserver %{_bindir}/smTestDriver %{_libdir}/paraview/ +%exclude %{_libdir}/paraview/*.a %files data -%{_datadir}/appdata/paraview.appdata.xml +%license Copyright.txt License_v1.2.txt +%dir %{_pkgdocdir} +%{_pkgdocdir}/README.md +%{_pkgdocdir}/README-VisItBridge.md +%{_datadir}/metainfo/paraview.appdata.xml %{_datadir}/applications/*paraview.desktop %{_datadir}/icons/hicolor/*/apps/paraview.png %{_datadir}/mime/packages/paraview.xml @@ -616,45 +613,50 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_bindir}/vtkkwProcessXML %{_includedir}/paraview/ %{_datadir}/cmake/ +%{_libdir}/paraview/*.a %files doc %license %{_datadir}/licenses/%{name}* -%doc %{_pkgdocdir} +%{_pkgdocdir} %if %{build_openmpi} %files openmpi -%license %{_datadir}/licenses/%{name}* -%doc %dir %{_pkgdocdir} -%doc %{_pkgdocdir}/README.md -%doc Utilities/VisItBridge/README-VisItBridge.md %{_libdir}/openmpi/bin/[ps]* %{_libdir}/openmpi/lib/paraview/ +%exclude %{_libdir}/openmpi/lib/paraview/*.a %files openmpi-devel +%{_includedir}/mpich-%{_arch}/mpich/ %{_libdir}/openmpi/bin/vtk* -%{_libdir}/openmpi/include/paraview/ +%{_libdir}/openmpi/lib/paraview/*.a %{_libdir}/openmpi/share/cmake/ %endif %if %{build_mpich} %files mpich -%license %{_datadir}/licenses/%{name}* -%doc %dir %{_pkgdocdir} -%doc %{_pkgdocdir}/README.md -%doc Utilities/VisItBridge/README-VisItBridge.md %{_libdir}/mpich/bin/[ps]* %{_libdir}/mpich/lib/paraview/ +%exclude %{_libdir}/mpich/lib/paraview/*.a %files mpich-devel +%{_includedir}/mpich-%{_arch}/paraview/ %{_libdir}/mpich/bin/vtk* -%{_libdir}/mpich/include/paraview/ +%{_libdir}/mpich/lib/paraview/*.a %{_libdir}/mpich/share/cmake/ %endif %changelog +* Fri Feb 15 2019 Orion Poplawski - 5.6.0-1 +- Update to 5.6.0 +- Drop old Obsoletes/Provides +- Enable openmpi build for s390x +- Fix appdata install location +- Consolidate license and readmes into -data sub-package +- Move static libraries into -devel and provide -static + * Fri Feb 01 2019 Fedora Release Engineering - 5.5.2-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index e72da01..e30ce27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ParaView-v5.5.2.tar.gz) = 3150d01cdeaf04aba449b7ffdc22d425d4bace8f17923b56aaf9393695e61fc96406ca49a9ca33ff57f1a2b94a3111b080d4fce5763cce5d082cfbc5c68ea94a +SHA512 (ParaView-v5.6.0.tar.gz) = 4d7c1b9f5781411cdd290a0ef105221deca1af28bb29b8e6e6c077f3377b110e7c86637c11514559d2d826d36f189d5b5c1caa9e5f9c53820cf35c3ade1ae1f6