Hello community, here is the log from the commit of package vtk for openSUSE:Factory checked in at 2018-11-27 10:43:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vtk (Old) and /work/SRC/openSUSE:Factory/.vtk.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vtk" Tue Nov 27 10:43:30 2018 rev:36 rq:652020 version:8.1.2 Changes: -------- New Changes file: --- /dev/null 2018-10-29 14:05:42.522318975 +0100 +++ /work/SRC/openSUSE:Factory/.vtk.new.19453/vtk-openmpi.changes 2018-11-27 10:44:59.824037237 +0100 @@ -0,0 +1,655 @@ +------------------------------------------------------------------- +Thu Nov 22 15:41:50 UTC 2018 - Todd R <[email protected]> + +- Update to version 8.1.2 + * Issue error if vtkAlgorithm::GetInputConnection called on wrong port + * Added explicit cast to pacify UBSan’s “implicit-integer-truncation” + * Make some orientation marker widget methods virtual + * vtkImageBlend bug fix for compound mode + * vtkFlyingEdges2D: Properly color multiple isocontour values + * Invoke DeletePointEvent before deleting vtkSeedWidget seed + * Fix compilation issue due to Python3.7 API change + * Fix bug where re-enabling seed widget wouldn't move existing seeds +- Fix python dependencies +- Test to make sure python package is importable +- Split out MPI version since the MPI version cannot be used + outside an MPI environment. + +------------------------------------------------------------------- +Fri Jun 29 07:17:51 UTC 2018 - [email protected] + +- Drop post[un] scripts for devel and java subpackages; they are + only needed for the versioned shlib. + +------------------------------------------------------------------- +Mon Jun 11 20:06:48 UTC 2018 - [email protected] + +- Update to version 8.1.1: + * Fixed thin border around vtkImageResliceMapper + rendering + * Fixed vtkImageResliceMapper showing a black + polygon when slice is out of bounds. + * Fixed conflict between Process.h and process.h + * Fixed building VTK 8.1 against 10.13 SDK + resulting in linker errors when trying to use + resulting libraries on older SDK + * Fixed vtkCellPicker::IntersectActorWithLine maybe + using invalid cell id when picking composite data +- Add fix_qt5_example_cmake.patch + Fixes use of removed cmake macro in some examples + See: https://gitlab.kitware.com/vtk/vtk/issues/17336 +- Use modern cmake spec file macros +- Run spec cleaner +- Other spec file cleanups +- Support parallel HDF5. +- Drop support for qt4. Any version of openSUSE with a recent + enough version of cmake to build the package supports Qt5. +- Drop checks for old versions of openSUSE that have too old + of a cmake to build. + +------------------------------------------------------------------- +Sun Feb 4 00:41:17 UTC 2018 - [email protected] + +- Use split libboost*-devel BuildRequires for TW and Leap/SLE 15 + +------------------------------------------------------------------- +Wed Jan 24 11:28:47 UTC 2018 - [email protected] + +- Fix build with jdk10 + * give a bogus javah path "%{_bindir}/true", since the cmake + checks the javah binary although the build does not use it. + +------------------------------------------------------------------- +Fri Jan 12 13:43:49 UTC 2018 - [email protected] + +- Drop vtk-Rinterface-uintptr_t.patch as the related plugin has + been retired. + +------------------------------------------------------------------- +Wed Jan 10 12:34:03 UTC 2018 - [email protected] + +- Drop vtk-compat_gl: Building against OpenGL1 has now been + deprecated with version 8.1.0, and the examples don't build + against it already; so, drop all specfile and related + modifications catering to OpenGL1 bindings. + +------------------------------------------------------------------- +Thu Dec 28 11:22:29 UTC 2017 - [email protected] + +- Update to version 8.1.0: + * Full release notes at https://blog.kitware.com/vtk-8-1-0/. +- Turn OFF building against system libharu, since libharu + upstream seems dead, while vtk's included libharu has new + features essential for building vtk 8.1. Drop BuildRequires on + libharu. +- Does not build against java 10, so ensure at most java 9 is + used by using appropriate versioning for java-devel + BuildRequires. +- Drop cmake options no longer used for build. +- Drop VERBOSE=1 for make: it makes the compilation too verbose + making brp checks for code warnings too slow to execute; this + reduces build time by nearly half. +- Enforce Qt4 for openSUSE <= 1320 explicitly because Qt5 is now + the default option. + +------------------------------------------------------------------- +Mon Dec 4 18:25:57 UTC 2017 - [email protected] + +- Move BuildRequires: libQtWebKit-devel (Qt4) inside the else + version < 13.2 + +------------------------------------------------------------------- +Thu Oct 26 08:48:16 UTC 2017 - [email protected] + +- Add conflict between the -devel-doc variants. + +------------------------------------------------------------------- +Tue Oct 24 11:55:17 UTC 2017 - [email protected] + +- Setup MPI environment before building. + +------------------------------------------------------------------- +Thu Oct 12 20:47:27 UTC 2017 - [email protected] + +- Rectify RPM groups again. + +------------------------------------------------------------------- +Sun Oct 1 20:36:49 UTC 2017 - [email protected] + +- Move the vtk binary to the tcl subpackage, it is an interactive + TCL shell, and depends on the TCL bindings. It can be used + standalone from the devel package. Dito for its MPI variant, i.e. + the pvtk binary. +- Move all libvtk*Java.so to the java subpackage. These are part of + the Java bindings, i.e. runtime dependencies. Otherwise, the java + subpacakge depends on the devel subpackage. +- Add the tcl and java subpackage to the devel requires again. + Although not stricly necessary until building java or tcl packages, + the cmake files have a hard dependency on several build artifacts + provided by the tcl and java subpackages. Split devel packages + for the bindings would be preferred, but this is not supported by + the upstream build system. +- Remove the openmpi-devel requires in the python subpackage, the + mpi runtime libraries are provided by openmpi-libs, which is + picked up automatically. + +------------------------------------------------------------------- +Sun Oct 01 17:04:57 UTC 2017 - [email protected] + +- Split the API documentation from the development subpackage. The + documentation amounts to almost 1 GByte of data, not necessary + when just building packages. + +------------------------------------------------------------------- +Thu Sep 28 10:43:27 UTC 2017 - [email protected] + +- Drop vtk-compat_gl-rpmlintrc: openSUSE:Factory bots don't accept + conditional sources and one rpmlintrc file is sufficient for + both main and linked packages anyway. + +------------------------------------------------------------------- +Tue Sep 19 10:46:40 UTC 2017 - [email protected] + +- do not exclude libViewsGeovisJava.so from devel package + This library is required for development. +- package vtk binary in devel package. +- VTKTargets-debug.cmake tests for the existance of the library (line 3394) + and the binary (line 3404) and causes an error if the files do + not exist + +------------------------------------------------------------------- +Thu Sep 14 20:54:34 UTC 2017 - [email protected] + +- Remove the various subpackage Requires from the devel package + again. The qt subpackage contains a Qt Designer plugin and no + dependency at all. Package the vtkWrap{Tcl,Java,Python} wrapper + generators in the devel package, as these are useless without + the vtk headers files. +- Fix description/summary of vtk-qt subpackage + +------------------------------------------------------------------- +Tue Sep 12 12:33:38 UTC 2017 - [email protected] + +- devel subpackage should require -tcl, -java and -qt subpackages + since the *.cmake files refer to files in those subpackages + +------------------------------------------------------------------- +Mon Sep 11 13:46:28 UTC 2017 - [email protected] + +- Add 0001-Allow-compilation-on-GLES-platforms.patch + The QOpenGLFunctions_3_2_Core class providing the framebuffer + blit functions is not available on GLES 2 builds of Qt5. Let Qt + handle the framebuffer blit, and just use the GLES/GL subset + provided by QOpenGLFunctions for the remainder. + Fix for https://gitlab.kitware.com/vtk/vtk/issues/17113 + +------------------------------------------------------------------- +Fri Sep 1 00:13:18 UTC 2017 - [email protected] + +- Update to version 8.0.1: + * Fix QVTKOpenGLWidget rendering issues on Windows machines with + certain Intel graphics chips. This was a significant issue + that broke all rendering and resulted in a black screen. + * Fix data array range caching per finite component which would + otherwise cause considerable slow-downs when using data + arrays. + * Fix button and slider widgets to work in multi-viewport render + windows. Without this change the widgets would either be ++++ 458 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.vtk.new.19453/vtk-openmpi.changes --- /work/SRC/openSUSE:Factory/vtk/vtk.changes 2018-07-02 23:32:21.677330243 +0200 +++ /work/SRC/openSUSE:Factory/.vtk.new.19453/vtk.changes 2018-11-27 10:45:02.292034704 +0100 @@ -1,0 +2,19 @@ +Thu Nov 22 15:41:50 UTC 2018 - Todd R <[email protected]> + +- Update to version 8.1.2 + * Issue error if vtkAlgorithm::GetInputConnection called on wrong port + * Added explicit cast to pacify UBSan’s “implicit-integer-truncation” + * Make some orientation marker widget methods virtual + * vtkImageBlend bug fix for compound mode + * vtkFlyingEdges2D: Properly color multiple isocontour values + * Invoke DeletePointEvent before deleting vtkSeedWidget seed + * Fix compilation issue due to Python3.7 API change + * Fix bug where re-enabling seed widget wouldn't move existing seeds +- Fix python dependencies +- Test to make sure python package is importable +- Split out MPI version since the MPI version cannot be used + outside an MPI environment. +- Build vtkData as part of the main package. This makes sure the + data is extracted into the correct format. + +------------------------------------------------------------------- Old: ---- VTK-8.1.1.tar.gz New: ---- VTK-8.1.2.tar.gz vtk-openmpi.changes vtk-openmpi.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vtk-openmpi.spec ++++++ # # spec file for package vtk-openmpi # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define compat_gl 0 %define pkgname vtk %define vtklib lib%{pkgname}1-openmpi %define shlib %{vtklib} %if 0%{?sle_version} <= 150000 %define mpiver openmpi2 %else %define mpiver openmpi3 %endif %define mpiprefix %{_libdir}/mpi/gcc/%{mpiver} Name: vtk-openmpi Version: 8.1.2 Release: 0 %define series 8.1 # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant Summary: The Visualization Toolkit - A high level 3D visualization library License: BSD-3-Clause Group: Productivity/Scientific/Other URL: http://vtk.org/ Source: http://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.gz # FIXME See if packaging can be tweaked to accommodate python-vtk's devel files in a devel package later # We need to use the compat conditionals here to avoid Factory's source validator from tripping up Source1: vtk-rpmlintrc # PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch [email protected] -- Fix file containing DATE and TIME Patch1: vtk-fix-file-contains-date-time.patch # PATCH-FIX-OPENSUSE 0001-Allow-compilation-on-GLES-platforms.patch VTK issue #17113 [email protected] -- Fix building with Qt GLES builds Patch3: 0001-Allow-compilation-on-GLES-platforms.patch # PATCH-FIX-UPSTREAM fix_qt5_example_cmake.patch -- Fix for recent Qt5 version https://gitlab.kitware.com/vtk/vtk/issues/17336 Patch4: fix_qt5_example_cmake.patch BuildRequires: %{mpiver} BuildRequires: %{mpiver}-devel BuildRequires: R-base-devel BuildRequires: chrpath BuildRequires: cmake >= 3.4 BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gl2ps-devel BuildRequires: gnuplot BuildRequires: graphviz BuildRequires: hdf5-devel BuildRequires: hdf5-openmpi-devel BuildRequires: java-devel BuildRequires: libjpeg-devel BuildRequires: libmysqlclient-devel BuildRequires: libnetcdf_c++-devel BuildRequires: libtiff-devel BuildRequires: python3-devel BuildRequires: python3-mpi4py-devel BuildRequires: python3-numpy-devel BuildRequires: python3-qt5-devel BuildRequires: wget BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5OpenGLExtensions) BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(jsoncpp) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavdevice) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libiodbc) BuildRequires: pkgconfig(liblz4) >= 1.7.3 BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(netcdf) BuildRequires: pkgconfig(tcl) BuildRequires: pkgconfig(theora) BuildRequires: pkgconfig(tk) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} >= 1500 BuildRequires: libboost_graph-devel BuildRequires: libboost_graph_parallel-devel BuildRequires: libboost_mpi-devel BuildRequires: libboost_serialization-devel %else BuildRequires: boost-devel %endif Provides: python3-%{name}-qt = %{version} %if %{?sles_version} BuildRequires: libxml2-devel %else BuildRequires: pkgconfig(libxml-2.0) %endif %description VTK is a software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many advanced algorithms (e.g. surface reconstruction, implicit modelling, decimation) and rendering techniques (e.g. hardware-accelerated volume rendering, LOD control). %package -n %{shlib} Summary: The Visualization Toolkit - A high level 3D visualization library Group: System/Libraries Provides: %{name} = %{version} %description -n %{shlib} VTK is a software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many advanced algorithms (e.g. surface reconstruction, implicit modelling, decimation) and rendering techniques (e.g. hardware-accelerated volume rendering, LOD control). This package provides the shared libraries for VTK. %package devel Summary: VTK header files for building C++ code # not strictly necessary, but required by VTKs cmake files Group: Development/Libraries/C and C++ Requires: %{mpiver} Requires: %{mpiver}-devel Requires: %{name}-java = %{version} Requires: %{name}-tcl = %{version} Requires: %{shlib} = %{version} Requires: R-base-devel Requires: cmake >= 3.4 Requires: gcc-c++ Requires: gl2ps-devel Requires: gnuplot Requires: graphviz Requires: hdf5-devel Requires: hdf5-openmpi-devel Requires: java-devel Requires: libjpeg-devel Requires: libmysqlclient-devel Requires: libnetcdf_c++-devel Requires: libtiff-devel Requires: pkgconfig(Qt5Core) Requires: pkgconfig(Qt5OpenGL) Requires: pkgconfig(Qt5OpenGLExtensions) Requires: pkgconfig(Qt5Sql) Requires: pkgconfig(Qt5WebKitWidgets) Requires: pkgconfig(Qt5Widgets) Requires: pkgconfig(expat) Requires: pkgconfig(freetype2) Requires: pkgconfig(gl) Requires: pkgconfig(jsoncpp) Requires: pkgconfig(libavcodec) Requires: pkgconfig(libavdevice) Requires: pkgconfig(libavformat) Requires: pkgconfig(libavutil) Requires: pkgconfig(libiodbc) Requires: pkgconfig(liblz4) >= 1.7.3 Requires: pkgconfig(libpng) Requires: pkgconfig(libswscale) Requires: pkgconfig(netcdf) Requires: pkgconfig(tcl) Requires: pkgconfig(theora) Requires: pkgconfig(tk) Requires: pkgconfig(x11) Requires: pkgconfig(xt) Requires: pkgconfig(zlib) %description devel VTK is a software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many advanced algorithms (e.g. surface reconstruction, implicit modelling, decimation) and rendering techniques (e.g. hardware-accelerated volume rendering, LOD control). This provides development libraries and header files required to compile C++ programs that use VTK to do 3D visualisation. %package devel-doc Summary: VTK API documentation Group: Documentation/HTML %description devel-doc VTK is a software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many advanced algorithms (e.g. surface reconstruction, implicit modelling, decimation) and rendering techniques (e.g. hardware-accelerated volume rendering, LOD control). This provides the VTK API documentation useful for developing programs that use VTK to do 3D visualisation. %package java Summary: Java bindings for VTK Group: Development/Libraries/Java Requires: %{shlib} = %{version} %description java VTK is a software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many advanced algorithms (e.g. surface reconstruction, implicit modelling, decimation) and rendering techniques (e.g. hardware-accelerated volume rendering, LOD control). This package provides java bindings for VTK. %package -n python3-%{name} Summary: Python bindings for VTK Group: Development/Libraries/Python Requires: %{shlib} = %{version} Requires: python3-mpi4py Requires: python3-numpy Requires: python3-qt5 Conflicts: python3-vtk Conflicts: python3-vtk-compat_gl %description -n python3-%{name} VTK is a software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many advanced algorithms (e.g. surface reconstruction, implicit modelling, decimation) and rendering techniques (e.g. hardware-accelerated volume rendering, LOD control). This package provides python 3.x bindings for VTK. %package qt Summary: Qt Designer plugin for QVTKWidget Group: Development/Libraries/C and C++ Requires: %{shlib} = %{version} %description qt VTK is a software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many advanced algorithms (e.g. surface reconstruction, implicit modelling, decimation) and rendering techniques (e.g. hardware-accelerated volume rendering, LOD control). This package provides a Qt Designer plugin for the QVTKWidget. %package tcl Summary: Tcl bindings for VTK Group: Development/Languages/Tcl Requires: %{shlib} = %{version} %description tcl VTK is a software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many advanced algorithms (e.g. surface reconstruction, implicit modelling, decimation) and rendering techniques (e.g. hardware-accelerated volume rendering, LOD control). This package provides tcl bindings for VTK. %package examples Summary: Examples for VTK Group: Documentation/Other Requires: %{shlib} = %{version} Recommends: vtkdata = %{version} %description examples VTK is a software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many advanced algorithms (e.g. surface reconstruction, implicit modelling, decimation) and rendering techniques (e.g. hardware-accelerated volume rendering, LOD control). This package contains many examples showing how to use VTK. Examples are available in the C++, Tcl, Python and Java programming languages. %package testing Summary: Testing programs for VTK Group: Productivity/Scientific/Other Requires: %{shlib} = %{version} Requires: vtkdata = %{version} %description testing VTK is a software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many advanced algorithms (e.g. surface reconstruction, implicit modelling, decimation) and rendering techniques (e.g. hardware-accelerated volume rendering, LOD control). This package provides a few testing programs for VTK. %prep %setup -q -n VTK-%{version} %patch1 -p1 %patch3 -p1 %patch4 -p1 # Replace relative path ../../../VTKData with %%{_datadir}/%%{pkgname}data-%%{version} # otherwise it will break on symlinks. grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs -r perl -pi -e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/%{pkgname},g' %build source %{mpiprefix}/bin/mpivars.sh export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" # FindJava.cmake looks for javah executable. However, # the build never invokes the tool. Define a bogus # Java_JAVAH_EXECUTABLE in order to be able to build # with JDK10 that does not have this tool, deprecated # since JDK8. %cmake \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON \ -DBUILD_TESTING:BOOL=OFF \ -DCMAKE_C_COMPILER:PATH=%{mpiprefix}/bin/mpicc \ -DCMAKE_CXX_COMPILER::PATH=%{mpiprefix}/bin/mpicxx \ -DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON \ -DJava_JAVAH_EXECUTABLE:PATH=%{_bindir}/true \ -DModule_vtkTestingCore:BOOL=ON \ -DModule_vtkTestingRendering:BOOL=ON \ -DOpenGL_GL_PREFERENCE:STRING='GLVND' \ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \ -DVTK_EXTERNAL_LIBHARU_IS_SHARED:BOOL=OFF \ -DVTK_Group_Imaging:BOOL=ON \ -DVTK_Group_MPI:BOOL=ON \ -DVTK_Group_Qt:BOOL=ON \ -DVTK_Group_Rendering:BOOL=ON \ -DVTK_Group_StandAlone:BOOL=ON \ -DVTK_Group_Tk:BOOL=ON \ -DVTK_Group_Views:BOOL=ON \ -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib} \ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib} \ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{pkgname} \ -DVTK_INSTALL_QT_DIR:STRING=%{_lib}/qt5/plugins/designer \ -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%( realpath --relative-to=%{mpiprefix} %{python3_sitearch} ) \ -DVTK_INSTALL_TCL_DIR:PATH=share/tcl/%{pkgname} \ -DVTK_PYTHON_VERSION=3 \ -DVTK_QT_VERSION=5 \ -DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \ -DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \ -DVTK_USE_SYSTEM_DIY2=OFF \ -DVTK_USE_SYSTEM_GL2PS=OFF \ -DVTK_USE_SYSTEM_HDF5:BOOL=ON \ -DVTK_USE_SYSTEM_LIBHARU:BOOL=OFF \ -DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \ -DVTK_USE_SYSTEM_MPI4PY=ON \ -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \ -DVTK_WRAP_JAVA:BOOL=ON \ -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_WRAP_PYTHON_SIP:BOOL=ON \ -DVTK_WRAP_TCL:BOOL=ON \ -DCMAKE_INSTALL_PREFIX:PATH=%{mpiprefix}/ \ -DINCLUDE_INSTALL_DIR:PATH=%{mpiprefix}/include/ \ -DCMAKE_INSTALL_LIBDIR:PATH=%{mpiprefix}/%{_lib} \ -DLIB_INSTALL_DIR:PATH=%{mpiprefix}/%{_lib} \ -DSHARE_INSTALL_PREFIX:PATH=%{mpiprefix}/share/ \ -DVTK_INSTALL_DOC_DIR:PATH=%( realpath --relative-to=%{mpiprefix} %{_docdir}/%{name}-%{series} ) %make_jobs make %{?_smp_mflags} DoxygenDoc # Remove executable bits from sources (some of which are generated) find . -name \*.c -o -name \*.cxx -o -name \*.h -o -name \*.hxx -o -name \*.gif -exec chmod -x "{}" "+" %install %cmake_install # List of executable examples cat > examples.list << EOF AmbientSpheres Arrays BalloonWidget BandedContours Cone Cone2 Cone3 Cone4 Cone5 Cone6 Cube Cylinder Delaunay3D Delaunay3DAlpha DiffuseSpheres DumpXMLFile FilledContours FixedPointVolumeRayCastMapperCT GPURenderDemo Generate2DAMRDataSetWithPulse Generate3DAMRDataSetWithPulse GenerateCubesFromLabels GenerateModelsFromLabels HierarchicalBoxPipeline ImageSlicing LabeledMesh Medical1 Medical2 Medical3 Medical4 MultiBlock ParticleReader RGrid SGrid Slider Slider2D SpecularSpheres TubesWithVaryingRadiusAndColors finance EOF # Install examples for file in `cat examples.list`; do install -p build/bin/$file %{buildroot}%{mpiprefix}/bin done perl -pi -e's,^,%{mpiprefix}/bin/,' examples.list %fdupes -s %{buildroot} %check # Make sure the python library is at least importable source %{_libdir}/mpi/gcc/%{mpiver}/bin/mpivars.sh export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{mpiprefix}/%{_lib} export PYTHONPATH=%{buildroot}%{python3_sitearch} python3 -c "import vtk" %post -n %{shlib} -p /sbin/ldconfig %postun -n %{shlib} -p /sbin/ldconfig %post -n python3-%{name} -p /sbin/ldconfig %postun -n python3-%{name} -p /sbin/ldconfig %files -n %{shlib} %license Copyright.txt %{_libdir}/mpi/gcc/%{mpiver}/%{_lib}/lib*.so.* %files devel %license Copyright.txt %{mpiprefix}/bin/%{pkgname}EncodeString %{mpiprefix}/bin/%{pkgname}HashSource %{mpiprefix}/bin/%{pkgname}ParseJava %{mpiprefix}/bin/%{pkgname}WrapHierarchy %{mpiprefix}/bin/%{pkgname}WrapJava %{mpiprefix}/bin/%{pkgname}WrapPython %{mpiprefix}/bin/%{pkgname}WrapPythonInit %{mpiprefix}/bin/%{pkgname}WrapTcl %{mpiprefix}/bin/%{pkgname}WrapTclInit %{mpiprefix}/%{_lib}/*.so %dir %{mpiprefix}/%{_lib}/cmake/ %{mpiprefix}/%{_lib}/cmake/%{pkgname}/ %{mpiprefix}/%{_lib}/libvtkWrappingTools.a %{mpiprefix}/include/%{pkgname}-%{series}/ # VTK JNI bindings %exclude %{mpiprefix}/%{_lib}/libvtk*Java.so %exclude %{mpiprefix}/%{_lib}/libvtkRenderingPythonTkWidgets*.so %exclude %{mpiprefix}/share/tcl/vtk/vtktcl.c %files devel-doc %license Copyright.txt %{_docdir}/%{name}-%{series} %files java %license Copyright.txt %{mpiprefix}/%{_lib}/%{pkgname}.jar %{mpiprefix}/%{_lib}/libvtk*Java.so %files -n python3-%{name} %license Copyright.txt %{mpiprefix}/bin/%{pkgname}python %{mpiprefix}/bin/p%{pkgname}python %{mpiprefix}/%{_lib}/libvtkRenderingPythonTkWidgets*.so %{python3_sitearch}/%{pkgname}/ %files tcl %license Copyright.txt %{mpiprefix}/bin/%{pkgname} %{mpiprefix}/bin/p%{pkgname} %{mpiprefix}/share/tcl %{mpiprefix}/share/tcl/%{pkgname}/ %files qt %license Copyright.txt %dir %{mpiprefix}/%{_lib}/qt5/ %dir %{mpiprefix}/%{_lib}/qt5/plugins/ %dir %{mpiprefix}/%{_lib}/qt5/plugins/designer/ %{mpiprefix}/%{_lib}/qt5/plugins/designer/libQVTKWidgetPlugin.so %files examples -f examples.list %license Copyright.txt %changelog ++++++ vtk.spec ++++++ --- /var/tmp/diff_new_pack.jzwh0z/_old 2018-11-27 10:45:03.624033337 +0100 +++ /var/tmp/diff_new_pack.jzwh0z/_new 2018-11-27 10:45:03.624033337 +0100 @@ -12,18 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define compat_gl 0 %define pkgname vtk %define vtklib lib%{pkgname}1 -%define vtkcompatlib libvtkcompat_gl1 %define shlib %{vtklib} Name: vtk -Version: 8.1.1 +Version: 8.1.2 Release: 0 %define series 8.1 # This is a variant BSD license, a cross between BSD and ZLIB. @@ -33,65 +32,69 @@ License: BSD-3-Clause Group: Productivity/Scientific/Other URL: http://vtk.org/ -Source: http://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.gz +Source: https://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.gz # FIXME See if packaging can be tweaked to accommodate python-vtk's devel files in a devel package later # We need to use the compat conditionals here to avoid Factory's source validator from tripping up -Source1: vtk-rpmlintrc +Source99: vtk-rpmlintrc # PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch [email protected] -- Fix file containing DATE and TIME Patch1: vtk-fix-file-contains-date-time.patch # PATCH-FIX-OPENSUSE 0001-Allow-compilation-on-GLES-platforms.patch VTK issue #17113 [email protected] -- Fix building with Qt GLES builds Patch3: 0001-Allow-compilation-on-GLES-platforms.patch # PATCH-FIX-UPSTREAM fix_qt5_example_cmake.patch -- Fix for recent Qt5 version https://gitlab.kitware.com/vtk/vtk/issues/17336 Patch4: fix_qt5_example_cmake.patch -BuildRequires: Mesa-libGL-devel BuildRequires: R-base-devel BuildRequires: chrpath BuildRequires: cmake >= 3.4 BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: gl2ps-devel BuildRequires: gnuplot BuildRequires: graphviz BuildRequires: hdf5-devel -BuildRequires: hdf5-openmpi-devel BuildRequires: java-devel -BuildRequires: jsoncpp-devel -BuildRequires: libX11-devel -BuildRequires: libXt-devel -%if 0%{?suse_version} >= 1500 -BuildRequires: libboost_graph-devel -BuildRequires: libboost_graph_parallel-devel -BuildRequires: libboost_mpi-devel -BuildRequires: libboost_serialization-devel -%else -BuildRequires: boost-devel -%endif -BuildRequires: libexpat-devel -BuildRequires: libiodbc-devel BuildRequires: libjpeg-devel -BuildRequires: liblz4-devel >= 1.7.3 BuildRequires: libmysqlclient-devel BuildRequires: libnetcdf_c++-devel -BuildRequires: libpng-devel -BuildRequires: libtheora-devel BuildRequires: libtiff-devel -BuildRequires: netcdf-devel -BuildRequires: openmpi-devel BuildRequires: python3-devel BuildRequires: python3-mpi4py-devel +BuildRequires: python3-numpy-devel BuildRequires: python3-qt5-devel -BuildRequires: tcl-devel -BuildRequires: tk-devel BuildRequires: wget -BuildRequires: zlib-devel BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5OpenGLExtensions) BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(jsoncpp) +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavdevice) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libiodbc) +BuildRequires: pkgconfig(liblz4) >= 1.7.3 +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libswscale) +BuildRequires: pkgconfig(netcdf) +BuildRequires: pkgconfig(tcl) +BuildRequires: pkgconfig(theora) +BuildRequires: pkgconfig(tk) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(zlib) +%if 0%{?suse_version} >= 1500 +BuildRequires: libboost_graph-devel +BuildRequires: libboost_graph_parallel-devel +BuildRequires: libboost_mpi-devel +BuildRequires: libboost_serialization-devel +%else +BuildRequires: boost-devel +%endif Provides: python3-%{name}-qt = %{version} %if %{?sles_version} BuildRequires: libxml2-devel @@ -103,17 +106,21 @@ VTK is a software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many advanced algorithms (e.g. surface reconstruction, implicit modelling, decimation) and -rendering techniques (e.g. hardware-accelerated volume rendering, LOD -control). +rendering techniques (e.g. hardware-accelerated volume rendering, +LOD control). %package -n %{shlib} Summary: The Visualization Toolkit - A high level 3D visualization library Group: System/Libraries -Conflicts: %{vtkcompatlib} +Conflicts: libvtkcompat_gl1 +Provides: %{name} = %{version} %description -n %{shlib} VTK is a software system for image processing, 3D graphics, volume -rendering and visualization. +rendering and visualization. VTK includes many advanced algorithms +(e.g. surface reconstruction, implicit modelling, decimation) and +rendering techniques (e.g. hardware-accelerated volume rendering, +LOD control). This package provides the shared libraries for VTK. @@ -124,33 +131,54 @@ Requires: %{name}-java = %{version} Requires: %{name}-tcl = %{version} Requires: %{shlib} = %{version} -Requires: Mesa-libGL-devel Requires: R-base-devel -Requires: freetype2-devel +Requires: cmake >= 3.4 +Requires: gcc-c++ Requires: gl2ps-devel +Requires: gnuplot +Requires: graphviz Requires: hdf5-devel -Requires: hdf5-openmpi-devel -Requires: jsoncpp-devel -Requires: libexpat-devel +Requires: java-devel Requires: libjpeg-devel -Requires: liblz4-devel Requires: libmysqlclient-devel Requires: libnetcdf_c++-devel -Requires: libogg-devel -Requires: libpng-devel -Requires: libtheora-devel Requires: libtiff-devel -Requires: libxml2-devel -Requires: netcdf-devel -Requires: openmpi-devel +Requires: pkgconfig(Qt5Core) +Requires: pkgconfig(Qt5OpenGL) +Requires: pkgconfig(Qt5OpenGLExtensions) +Requires: pkgconfig(Qt5Sql) +Requires: pkgconfig(Qt5WebKitWidgets) +Requires: pkgconfig(Qt5Widgets) +Requires: pkgconfig(expat) +Requires: pkgconfig(freetype2) +Requires: pkgconfig(gl) +Requires: pkgconfig(jsoncpp) +Requires: pkgconfig(libavcodec) +Requires: pkgconfig(libavdevice) +Requires: pkgconfig(libavformat) +Requires: pkgconfig(libavutil) +Requires: pkgconfig(libiodbc) +Requires: pkgconfig(liblz4) >= 1.7.3 +Requires: pkgconfig(libpng) +Requires: pkgconfig(libswscale) +Requires: pkgconfig(netcdf) +Requires: pkgconfig(tcl) +Requires: pkgconfig(theora) +Requires: pkgconfig(tk) +Requires: pkgconfig(x11) +Requires: pkgconfig(xt) +Requires: pkgconfig(zlib) Conflicts: vtk-compat_gl-devel %description devel VTK is a software system for image processing, 3D graphics, volume -rendering and visualization. +rendering and visualization. VTK includes many advanced algorithms +(e.g. surface reconstruction, implicit modelling, decimation) and +rendering techniques (e.g. hardware-accelerated volume rendering, +LOD control). -This provides the VTK header files required to compile C++ programs that -use VTK to do 3D visualisation. +This provides development libraries and header files required to +compile C++ programs that use VTK to do 3D visualisation. %package devel-doc Summary: VTK API documentation @@ -158,10 +186,13 @@ %description devel-doc VTK is a software system for image processing, 3D graphics, volume -rendering and visualization. +rendering and visualization. VTK includes many advanced algorithms +(e.g. surface reconstruction, implicit modelling, decimation) and +rendering techniques (e.g. hardware-accelerated volume rendering, +LOD control). -This provides the VTK API documentation useful for developing programs that -use VTK to do 3D visualisation. +This provides the VTK API documentation useful for developing +programs that use VTK to do 3D visualisation. %package java Summary: Java bindings for VTK @@ -171,21 +202,30 @@ %description java VTK is a software system for image processing, 3D graphics, volume -rendering and visualization. +rendering and visualization. VTK includes many advanced algorithms +(e.g. surface reconstruction, implicit modelling, decimation) and +rendering techniques (e.g. hardware-accelerated volume rendering, +LOD control). This package provides java bindings for VTK. %package -n python3-%{name} Summary: Python bindings for VTK -Group: Development/Languages/Python +Group: Development/Libraries/Python Requires: %{shlib} = %{version} +Requires: python3-mpi4py +Requires: python3-numpy +Requires: python3-qt5 Conflicts: python3-vtk-compat_gl %description -n python3-%{name} VTK is a software system for image processing, 3D graphics, volume -rendering and visualization. +rendering and visualization. VTK includes many advanced algorithms +(e.g. surface reconstruction, implicit modelling, decimation) and +rendering techniques (e.g. hardware-accelerated volume rendering, +LOD control). -This package provides python bindings for VTK. +This package provides python 3.x bindings for VTK. %package qt Summary: Qt Designer plugin for QVTKWidget @@ -195,7 +235,10 @@ %description qt VTK is a software system for image processing, 3D graphics, volume -rendering and visualization. +rendering and visualization. VTK includes many advanced algorithms +(e.g. surface reconstruction, implicit modelling, decimation) and +rendering techniques (e.g. hardware-accelerated volume rendering, +LOD control). This package provides a Qt Designer plugin for the QVTKWidget. @@ -207,34 +250,44 @@ %description tcl VTK is a software system for image processing, 3D graphics, volume -rendering and visualization. +rendering and visualization. VTK includes many advanced algorithms +(e.g. surface reconstruction, implicit modelling, decimation) and +rendering techniques (e.g. hardware-accelerated volume rendering, +LOD control). This package provides tcl bindings for VTK. %package examples Summary: Examples for VTK -Group: Productivity/Scientific/Other +Group: Documentation/Other Requires: %{shlib} = %{version} -Recommends: %{name}data = %{version} +Recommends: vtkdata = %{version} Conflicts: vtk-compat_gl-examples %description examples VTK is a software system for image processing, 3D graphics, volume -rendering and visualization. +rendering and visualization. VTK includes many advanced algorithms +(e.g. surface reconstruction, implicit modelling, decimation) and +rendering techniques (e.g. hardware-accelerated volume rendering, +LOD control). -This package contains many examples showing how to use VTK. Examples -are available in the C++, Tcl, Python and Java programming languages. +This package contains many examples showing how to use VTK. +Examples are available in the C++, Tcl, Python and Java programming +languages. %package testing Summary: Testing programs for VTK Group: Productivity/Scientific/Other -Requires: %{name}data = %{version} Requires: %{shlib} = %{version} +Requires: vtkdata = %{version} Conflicts: vtk-compat_gl-testing %description testing VTK is a software system for image processing, 3D graphics, volume -rendering and visualization. +rendering and visualization. VTK includes many advanced algorithms +(e.g. surface reconstruction, implicit modelling, decimation) and +rendering techniques (e.g. hardware-accelerated volume rendering, +LOD control). This package provides a few testing programs for VTK. @@ -252,10 +305,6 @@ export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" -if [ -f %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh ]; then - source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh -fi - # FindJava.cmake looks for javah executable. However, # the build never invokes the tool. Define a bogus # Java_JAVAH_EXECUTABLE in order to be able to build @@ -265,8 +314,8 @@ -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON \ -DBUILD_TESTING:BOOL=OFF \ - -DCMAKE_CXX_COMPILER:STRING='mpicxx' \ - -DCMAKE_C_COMPILER:STRING='mpicc' \ + -DCMAKE_C_COMPILER:STRING='gcc' \ + -DCMAKE_CXX_COMPILER::STRING='g++' \ -DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON \ -DJava_JAVAH_EXECUTABLE:PATH=%{_bindir}/true \ -DModule_vtkTestingCore:BOOL=ON \ @@ -275,7 +324,7 @@ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \ -DVTK_EXTERNAL_LIBHARU_IS_SHARED:BOOL=OFF \ -DVTK_Group_Imaging:BOOL=ON \ - -DVTK_Group_MPI:BOOL=ON \ + -DVTK_Group_MPI:BOOL=OFF \ -DVTK_Group_Qt:BOOL=ON \ -DVTK_Group_Rendering:BOOL=ON \ -DVTK_Group_StandAlone:BOOL=ON \ @@ -284,8 +333,8 @@ -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib} \ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib} \ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{pkgname} \ - -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{py3_ver}/site-packages \ - -DVTK_INSTALL_QT_DIR:STRING=/%{_lib}/qt5/plugins/designer \ + -DVTK_INSTALL_QT_DIR:STRING=%{_lib}/qt5/plugins/designer \ + -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%( realpath --relative-to=%{_prefix} %{python3_sitearch} ) \ -DVTK_INSTALL_TCL_DIR:PATH=share/tcl/%{pkgname} \ -DVTK_PYTHON_VERSION=3 \ -DVTK_QT_VERSION=5 \ @@ -301,7 +350,8 @@ -DVTK_WRAP_JAVA:BOOL=ON \ -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_WRAP_PYTHON_SIP:BOOL=ON \ - -DVTK_WRAP_TCL:BOOL=ON + -DVTK_WRAP_TCL:BOOL=ON \ + -DVTK_INSTALL_DOC_DIR:PATH=%( realpath --relative-to=%{_prefix} %{_docdir}/%{name}-%{series} ) %make_jobs make %{?_smp_mflags} DoxygenDoc @@ -361,14 +411,20 @@ done perl -pi -e's,^,%{_bindir}/,' examples.list -# Remove rpaths from installed binaries -chrpath -d %{buildroot}%{_bindir}/* - %fdupes -s %{buildroot} +%check +# Make sure the python library is at least importable +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} +export PYTHONPATH=%{buildroot}%{python3_sitearch} +python3 -c "import vtk" + %post -n %{shlib} -p /sbin/ldconfig %postun -n %{shlib} -p /sbin/ldconfig +%post -n python3-%{name} -p /sbin/ldconfig +%postun -n python3-%{name} -p /sbin/ldconfig + %files -n %{shlib} %license Copyright.txt %{_libdir}/lib*.so.* @@ -390,11 +446,12 @@ %{_includedir}/%{pkgname}-%{series}/ # VTK JNI bindings %exclude %{_libdir}/libvtk*Java.so +%exclude %{_libdir}/libvtkRenderingPythonTkWidgets*.so %exclude %{_datadir}/tcl/vtk/vtktcl.c %files devel-doc %license Copyright.txt -%{_datadir}/doc/%{pkgname}-%{series}/ +%{_docdir}/%{name}-%{series} %files java %license Copyright.txt @@ -404,13 +461,12 @@ %files -n python3-%{name} %license Copyright.txt %{_bindir}/%{pkgname}python -%{_bindir}/p%{pkgname}python +%{_libdir}/libvtkRenderingPythonTkWidgets*.so %{python3_sitearch}/%{pkgname}/ %files tcl %license Copyright.txt %{_bindir}/%{pkgname} -%{_bindir}/p%{pkgname} %{_datadir}/tcl/%{pkgname}/ %files qt ++++++ VTK-8.1.1.tar.gz -> VTK-8.1.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/vtk/VTK-8.1.1.tar.gz /work/SRC/openSUSE:Factory/.vtk.new.19453/VTK-8.1.2.tar.gz differ: char 5, line 1 ++++++ vtk-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.jzwh0z/_old 2018-11-27 10:45:03.712033247 +0100 +++ /var/tmp/diff_new_pack.jzwh0z/_new 2018-11-27 10:45:03.712033247 +0100 @@ -1,6 +1,11 @@ # FIXME: See if packaging can be tweaked to avoid these warnings later # python-vtk needs these devel files to work -addFilter("python3-vtk* devel-file-in-non-devel-package") +addFilter("python3-vtk.* shlib-policy-name-error") +addFilter("python3-vtk.* shlib-policy-missing-suffix") +addFilter("python3-vtk.* devel-file-in-non-devel-package") +addFilter("python3-vtk-openmpi.* shlib-policy-name-error") +addFilter("python3-vtk-openmpi.* shlib-policy-missing-suffix") +addFilter("python3-vtk-openmpi.* devel-file-in-non-devel-package") # Upstream does not supply manuals for any binary, suppress warnings addFilter(".* no-manual-page-for-binary") @@ -10,10 +15,10 @@ addFilter("vtk-java.* shlib-policy-name-error") addFilter("vtk-java.* shlib-policy-missing-suffix") addFilter("vtk-java.* devel-file-in-non-devel-package") -addFilter("vtk-compat_gl-java.* shlib-policy-name-error") -addFilter("vtk-compat_gl-java.* shlib-policy-missing-suffix") -addFilter("vtk-compat_gl-java.* devel-file-in-non-devel-package") +addFilter("vtk-openmpi-java.* shlib-policy-name-error") +addFilter("vtk-openmpi-java.* shlib-policy-missing-suffix") +addFilter("vtk-openmpi-java.* devel-file-in-non-devel-package") # Used by tcl bindings addFilter("vtk-tcl.* devel-file-in-non-devel-package") -addFilter("vtk-compat_gl-tcl.* devel-file-in-non-devel-package") +addFilter("vtk-openmpi-tcl.* devel-file-in-non-devel-package")
