Hello community,
here is the log from the commit of package vtk for openSUSE:Factory checked in
at 2017-08-28 15:12:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vtk (Old)
and /work/SRC/openSUSE:Factory/.vtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vtk"
Mon Aug 28 15:12:57 2017 rev:27 rq:518423 version:8.0.0
Changes:
--------
New Changes file:
--- /dev/null 2017-07-20 07:30:00.335470106 +0200
+++ /work/SRC/openSUSE:Factory/.vtk.new/vtk-compat_gl.changes 2017-08-28
15:14:47.880683224 +0200
@@ -0,0 +1,449 @@
+-------------------------------------------------------------------
+Mon Aug 21 18:41:37 UTC 2017 - badshah...@gmail.com
+
+- Suppress romlint error about shlib-policy-name-error for
+ %{name}-java -- libvtkViewsGeovisJava.so packaged therein
+ is not a versioned shared lib, and only used by vtk's java
+ bindings, so there is no point in enforcing the shared lib
+ packaging policy for this subpackage.
+
+-------------------------------------------------------------------
+Wed Aug 9 10:40:59 UTC 2017 - badshah...@gmail.com
+
+- Move libvtkViewsGeovisJava.so to the %{name}-java subpackage,
+ this is not really a devel file.
+
+-------------------------------------------------------------------
+Wed Aug 9 08:54:55 UTC 2017 - jeng...@inai.de
+
+- Fix RPM groups. Use POSIX-compliant find call.
+
+-------------------------------------------------------------------
+Mon Aug 7 09:13:03 UTC 2017 - badshah...@gmail.com
+
+- Implement shared library packaging policy for vtk:
+ + Rename %{name} to %{shlib}.
+ + Move all shared library objects to %{shlib} package.
+ + Remove no longer needed Requires from %{name}-devel package;
+ e.g.: %{name}-java contains the java binaries and jar object
+ now, and no longer the lib*Java.so file which has been moved
+ into %{shlib}.
+ + Adapt conflicts for vtk-compat_gl accordingly.
+ + Install libraries to /usr/lib(64) instead of
+ /usr/lib(64)/vtk.
+ + Do away with python3-%{name}-qt subpackage and
+ Obsolete/Provide it from %{shlib} as it only contained a
+ shared lib object.
+- Use system mpi4py; add BuildRequires on python3-mpi4py.
+- liblz4 >= 1.7.3 now required (since version 8.0); adapt
+ BuildRequires accordingly.
+
+-------------------------------------------------------------------
+Tue Jul 25 00:04:11 UTC 2017 - jeng...@inai.de
+
+- Trim descriptions and rectify RPM groups.
+
+-------------------------------------------------------------------
+Mon Jul 17 23:37:37 UTC 2017 - adr...@suse.de
+
+- add liblz4-devel and libharu-devel also to Requires of devel package
+ (fixes linking errors in other packages)
+
+-------------------------------------------------------------------
+Mon Jul 3 13:47:05 UTC 2017 - badshah...@gmail.com
+
+- Update to version 8.0.0:
+ * Read about changes here: https://blog.kitware.com/vtk-8-0-0/
+ * API changes:
+ http://www.vtk.org/Wiki/VTK/API_Changes_7_1_0_to_8_0_0
+- Add BuildRequires on liblz4-devel, libharu-devel, mandatory
+ requirements for version 8.0.0.
+- Run make DoxygenDoc to generate documentation.
+
+-------------------------------------------------------------------
+Fri Apr 14 18:18:36 UTC 2017 - kkhere....@gmail.com
+
+- add a separate package vtk-compat_gl compile using rendering backend
+ OpenGL for systems without brand new graphic cards
+- default package vtk still uses new rendering backend default OpenGL2
+
+-------------------------------------------------------------------
+Wed Nov 23 10:28:02 UTC 2016 - badshah...@gmail.com
+
+- Update to version 7.1.0: See news item at
+
https://blog.kitware.com/kitware-plans-to-spotlight-new-vtk-and-paraview-releases-at-sc16/
+- Drop patch vtk-gcc6.patch, upstreamed.
+- Turn off usage of system DIY2, this library is not yet packaged
+ for openSUSE.
+- Disable mkg3states binary also for openSUSE:Leap versions.
+- Update file list for upstream installation changes.
+- Use bundled gl2ps, as it no longer builds against the system
+ one (requires svn trunk version of gl2ps).
+- CMake >= 3.4 is now required (earlier versions don't support
+ NAMES_PER_DIR in find_program).
+- Enable use of SYSTEM_LIBRARIES for openSUSE:Leap versions too
+ (only 13.2 requires this turned off as of now).
+
+-------------------------------------------------------------------
+Wed Aug 10 00:56:56 UTC 2016 - badshah...@gmail.com
+
+- Refresh vtk-Rinterface-uintptr_t.patch to fix further issues
+ with uintptr_t redefinition by defining the HAVE_UINTPTR_T
+ macro using cmake functions; removing the #include of stdint.h
+ is not needed any more since we will not be using the defs from
+ Rinterface.h anyway (boo#985386). Although this really causes a
+ build failure for the i586 arch, where the redefinition of
+ unitptr_t in Rinterface.h conflicts with the stdint.h defintion,
+ the patch is applied generally because the redefinition is not
+ needed in any case. Patch sent upstream.
+
+-------------------------------------------------------------------
+Wed Apr 13 11:32:12 UTC 2016 - badshah...@gmail.com
+
+- Add freetype2-devel as a Requires for vtk-devel.
+
+-------------------------------------------------------------------
+Wed Mar 30 14:31:03 UTC 2016 - badshah...@gmail.com
+
+- Apply vtk-gcc6.patch also to python-vtk.
+
+-------------------------------------------------------------------
+Wed Mar 30 13:08:09 UTC 2016 - ste...@gmail.com
+
+- Fixed RPATH error for Factory by passing the option
+ CMAKE_NO_BUILTIN_CHRPATH:BOOL=ON to cmake.
+
+-------------------------------------------------------------------
+Tue Mar 29 20:27:32 UTC 2016 - dmuel...@suse.com
+
+- add vtk-gcc6.patch: Fix build with gcc 6
+- skip RPATH setting
+
+-------------------------------------------------------------------
+Fri Mar 18 19:27:34 UTC 2016 - ste...@gmail.com
+
+- openmpi-libs will be installed with openmpi-devel if necessary.
+ No such package on openSUSE 13.1.
+
+-------------------------------------------------------------------
+Tue Mar 15 13:33:58 UTC 2016 - dval...@suse.com
+
+- Add disk constraints
+
+-------------------------------------------------------------------
+Wed Feb 17 01:13:12 UTC 2016 - badshah...@gmail.com
+
+- Update to version 7.0.0:
+ + See https://blog.kitware.com/vtk-7-0-0/ for a detailed
+ article describing all the changes in this version.
+- Add vtk-Rinterface-uintptr_t.patch to fix building: uintptr_t
+ is already defined in the R headers, uintptr_t definition in
+ <stdint.h> conflicts with the R definition and causes builds to
+ fail. This patch fixes the problem by commenting out the call
+ to include stdint.h (it was only being used for this solitary
+ symbol).
+- Use python 3 for building, rename python- subpackages
+ accordingly to python3-.
+- Update file lists in accordance with added/dropped binaries
+ upstream; affects vtk-examples, vtk-devel.
+- Drop conditionals referencing outdated openSUSE version 12.3.
+- Update rpmlintrc file to suppress rpmlint warnings for
+ "no-manual-page-for-binary": upstream does not supply manuals
+ for its binaries and does not plan to.
+
+-------------------------------------------------------------------
+Fri Sep 18 09:11:38 UTC 2015 - badshah...@gmail.com
+
+- vtkdata should be a Recommends for vtk-examples, not Requires.
+
+-------------------------------------------------------------------
+Mon Aug 31 07:39:10 UTC 2015 - badshah...@gmail.com
+
+- Update to version 6.3.0:
+ - See list of changes at
+ http://www.vtk.org/Bug/changelog_page.php?version_id=118
+ or blog post at
+ http://www.kitware.com/blog/home/post/963.
+
+-------------------------------------------------------------------
+Sat Aug 15 04:16:39 UTC 2015 - badshah...@gmail.com
+
+- python-vtk also needs openmpi-devel at runtime.
+
+-------------------------------------------------------------------
+Fri Aug 14 10:51:11 UTC 2015 - badshah...@gmail.com
+
+- python-vtk should have Requires on openmpi-libs to enable its
+ parallelized modules to work.
+
+-------------------------------------------------------------------
+Thu Jun 25 08:17:04 UTC 2015 - alinm.el...@gmail.com
+
+- use qt5 for factory
+
+-------------------------------------------------------------------
+Mon Jun 22 18:00:32 UTC 2015 - o...@aepfle.de
+
+- Add libxml2-devel/netcdf-devel/libnetcdf_c++-devel Requires to vtk-devel
+
+-------------------------------------------------------------------
+Wed Apr 8 19:57:31 UTC 2015 - dims...@opensuse.org
+
+- Add jsoncpp-devel Requires to vtk-devel (for openSUSE > 13.2):
+ vtkjsoncpp.cmake has
+ set(vtkjsoncpp_LIBRARIES "/usr/lib64/libjsoncpp.so").
+
+-------------------------------------------------------------------
+Fri Mar 13 19:50:12 UTC 2015 - badshah...@gmail.com
++++ 252 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.vtk.new/vtk-compat_gl.changes
--- /work/SRC/openSUSE:Factory/vtk/vtk.changes 2017-02-03 20:04:51.588453168
+0100
+++ /work/SRC/openSUSE:Factory/.vtk.new/vtk.changes 2017-08-28
15:14:49.764418552 +0200
@@ -1,0 +2,69 @@
+Mon Aug 21 18:41:37 UTC 2017 - badshah...@gmail.com
+
+- Suppress romlint error about shlib-policy-name-error for
+ %{name}-java -- libvtkViewsGeovisJava.so packaged therein
+ is not a versioned shared lib, and only used by vtk's java
+ bindings, so there is no point in enforcing the shared lib
+ packaging policy for this subpackage.
+
+-------------------------------------------------------------------
+Wed Aug 9 10:40:59 UTC 2017 - badshah...@gmail.com
+
+- Move libvtkViewsGeovisJava.so to the %{name}-java subpackage,
+ this is not really a devel file.
+
+-------------------------------------------------------------------
+Wed Aug 9 08:54:55 UTC 2017 - jeng...@inai.de
+
+- Fix RPM groups. Use POSIX-compliant find call.
+
+-------------------------------------------------------------------
+Mon Aug 7 09:13:03 UTC 2017 - badshah...@gmail.com
+
+- Implement shared library packaging policy for vtk:
+ + Rename %{name} to %{shlib}.
+ + Move all shared library objects to %{shlib} package.
+ + Remove no longer needed Requires from %{name}-devel package;
+ e.g.: %{name}-java contains the java binaries and jar object
+ now, and no longer the lib*Java.so file which has been moved
+ into %{shlib}.
+ + Adapt conflicts for vtk-compat_gl accordingly.
+ + Install libraries to /usr/lib(64) instead of
+ /usr/lib(64)/vtk.
+ + Do away with python3-%{name}-qt subpackage and
+ Obsolete/Provide it from %{shlib} as it only contained a
+ shared lib object.
+- Use system mpi4py; add BuildRequires on python3-mpi4py.
+- liblz4 >= 1.7.3 now required (since version 8.0); adapt
+ BuildRequires accordingly.
+
+-------------------------------------------------------------------
+Tue Jul 25 00:04:11 UTC 2017 - jeng...@inai.de
+
+- Trim descriptions and rectify RPM groups.
+
+-------------------------------------------------------------------
+Mon Jul 17 23:37:37 UTC 2017 - adr...@suse.de
+
+- add liblz4-devel and libharu-devel also to Requires of devel package
+ (fixes linking errors in other packages)
+
+-------------------------------------------------------------------
+Mon Jul 3 13:47:05 UTC 2017 - badshah...@gmail.com
+
+- Update to version 8.0.0:
+ * Read about changes here: https://blog.kitware.com/vtk-8-0-0/
+ * API changes:
+ http://www.vtk.org/Wiki/VTK/API_Changes_7_1_0_to_8_0_0
+- Add BuildRequires on liblz4-devel, libharu-devel, mandatory
+ requirements for version 8.0.0.
+- Run make DoxygenDoc to generate documentation.
+
+-------------------------------------------------------------------
+Fri Apr 14 18:18:36 UTC 2017 - kkhere....@gmail.com
+
+- add a separate package vtk-compat_gl compile using rendering backend
+ OpenGL for systems without brand new graphic cards
+- default package vtk still uses new rendering backend default OpenGL2
+
+-------------------------------------------------------------------
Old:
----
VTK-7.1.0.tar.gz
New:
----
VTK-8.0.0.tar.gz
pre_checkin.sh
vtk-compat_gl-rpmlintrc
vtk-compat_gl.changes
vtk-compat_gl.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vtk-compat_gl.spec ++++++
#
# spec file for package vtk-compat_gl
#
# Copyright (c) 2017 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 http://bugs.opensuse.org/
#
%define compat_gl 1
%define pkgname vtk
%define vtklib lib%{pkgname}1
%define vtkcompatlib libvtkcompat_gl1
%if %{compat_gl}
%define shlib %{vtkcompatlib}
%else
%define shlib %{vtklib}
%endif
%if %{compat_gl}
Name: vtk-compat_gl
%else
Name: vtk
%endif
Version: 8.0.0
Release: 0
%define series 8.0
# 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
%if %{compat_gl}
Source1: vtk-compat_gl-rpmlintrc
%else
Source1: vtk-rpmlintrc
%endif
# PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch badshah...@gmail.com
-- Fix file containing DATE and TIME
Patch1: vtk-fix-file-contains-date-time.patch
# PATCH-FIX-UPSTREAM vtk-Rinterface-uintptr_t.patch boo#985386
badshah...@gmail.com -- Fix issues with uintptr_t redefinition by defining the
HAVE_UINTPTR_T macro using cmake functions to avoid redefinition of uintptr_t,
which is already defined in stdint.h called earlier; patch sent upstream
Patch2: vtk-Rinterface-uintptr_t.patch
BuildRequires: Mesa-libGL-devel
BuildRequires: R-base-devel
BuildRequires: boost-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: java-devel
BuildRequires: libQtWebKit-devel
BuildRequires: libX11-devel
BuildRequires: libXt-devel
BuildRequires: libexpat-devel
BuildRequires: libharu-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: tcl-devel
BuildRequires: tk-devel
BuildRequires: wget
BuildRequires: zlib-devel
%if 0%{?suse_version} > 1320
BuildRequires: python3-qt5-devel
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5OpenGLExtensions)
BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5Widgets)
%else
BuildRequires: libqt4-devel
BuildRequires: python3-qt4-devel
%endif
%if %{?sles_version}
BuildRequires: libxml2-devel
%else
BuildRequires: pkgconfig(libxml-2.0)
%endif
# jsoncpp available for openSUSE > 13.2 & Leap
%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315
BuildRequires: jsoncpp-devel
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1320
%define qtdir %{_lib}/qt5
%else
%define qtdir %{_lib}/qt4
%endif
Provides: python3-%{name}-qt = %{version}
%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
%if %{compat_gl}
Conflicts: %{vtklib}
%else
Conflicts: %{vtkcompatlib}
%endif
%description -n %{shlib}
VTK is a software system for image processing, 3D graphics, volume
rendering and visualization.
This package provides the shared libraries for VTK.
%package devel
Summary: VTK header files for building C++ code
Group: Development/Libraries/C and C++
Requires: %{shlib} = %{version}
Requires: Mesa-libGL-devel
Requires: R-base-devel
Requires: gl2ps-devel
Requires: hdf5-devel
# jsoncpp available for openSUSE > 13.2 & Leap
%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315
Requires: jsoncpp-devel
%endif
Requires: freetype2-devel
Requires: libexpat-devel
Requires: libharu-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
%if %{compat_gl}
Conflicts: vtk-devel
Provides: vtk-devel
%else
Conflicts: vtk-compat_gl-devel
%endif
%description devel
VTK is a software system for image processing, 3D graphics, volume
rendering and visualization.
This provides the VTK header files required to compile C++ programs that
use VTK to do 3D visualisation.
%package java
Summary: Java bindings for VTK
Group: Development/Libraries/Java
Requires: %{shlib} = %{version}
%if %{compat_gl}
Conflicts: vtk-java
Provides: vtk-java
%else
Conflicts: vtk-compat_gl-java
%endif
%description java
VTK is a software system for image processing, 3D graphics, volume
rendering and visualization.
This package provides java bindings for VTK.
%package -n python3-%{name}
Summary: Python bindings for VTK
Group: Development/Languages/Python
Requires: %{shlib} = %{version}
# DESPITE NOT BEING A DEVEL PACKAGE, THIS REQUIRES OPENMPI-DEVEL TO RUN
Requires: openmpi-devel
%if %{compat_gl}
Conflicts: python3-vtk
Provides: python3-vtk
%else
Conflicts: python3-vtk-compat_gl
%endif
%description -n python3-%{name}
VTK is a software system for image processing, 3D graphics, volume
rendering and visualization.
This package provides python bindings for VTK.
%package qt
Summary: Qt VTK widget
Group: Development/Libraries/C and C++
Requires: %{shlib} = %{version}
%if %{compat_gl}
Conflicts: vtk-qt
Provides: vtk-qt
%else
Conflicts: vtk-compat_gl-qt
%endif
%description qt
VTK is a software system for image processing, 3D graphics, volume
rendering and visualization.
This package provides Qt bindings for VTK.
%package tcl
Summary: Tcl bindings for VTK
Group: Development/Languages/Tcl
Requires: %{shlib} = %{version}
%if %{compat_gl}
Conflicts: vtk-tcl
Provides: vtk-tcl
%else
Conflicts: vtk-compat_gl-tcl
%endif
%description tcl
VTK is a software system for image processing, 3D graphics, volume
rendering and visualization.
This package provides tcl bindings for VTK.
%package examples
Summary: Examples for VTK
Group: Productivity/Scientific/Other
Requires: %{shlib} = %{version}
Recommends: %{name}data = %{version}
%if %{compat_gl}
Conflicts: vtk-examples
Provides: vtk-examples
%else
Conflicts: vtk-compat_gl-examples
%endif
%description examples
VTK is a software system for image processing, 3D graphics, volume
rendering and visualization.
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}
%if %{compat_gl}
Conflicts: vtk-testing
Provides: vtk-testing
%else
Conflicts: vtk-compat_gl-testing
%endif
%description testing
VTK is a software system for image processing, 3D graphics, volume
rendering and visualization.
This package provides a few testing programs for VTK.
%prep
%setup -q -n VTK-%{version}
%patch1 -p1
%patch2 -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
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
mkdir build
pushd build
cmake .. \
-DCMAKE_CXX_COMPILER:STRING='mpicxx' \
-DCMAKE_C_COMPILER:STRING='mpicc' \
-DBUILD_DOCUMENTATION:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
-DBUILD_TESTING:BOOL=OFF \
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DVTK_CUSTOM_LIBRARY_SUFFIX="" \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DSIP_INCLUDE_DIR:Path=%{py3_incdir} \
-DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib} \
-DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib} \
-DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{pkgname} \
-DVTK_INSTALL_TCL_DIR:PATH=share/tcl/%{pkgname} \
%if 0%{?suse_version} > 1320
-DVTK_QT_VERSION=5 \
%endif
-DVTK_INSTALL_QT_DIR:STRING=/%{qtdir}/plugins/designer \
-DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \
-DVTK_USE_RENDERING:BOOL=ON \
%if %{compat_gl}
-DVTK_RENDERING_BACKEND:STRING='OpenGL' \
%endif
%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315
-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
%else
-DVTK_USE_SYSTEM_LIBRARIES:BOOL=OFF \
%endif
-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \
-DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{py3_ver}/site-packages
\
-DVTK_WRAP_PYTHON:BOOL=ON \
-DVTK_WRAP_JAVA:BOOL=ON \
-DVTK_WRAP_PYTHON_SIP:BOOL=ON \
-DVTK_WRAP_TCL:BOOL=ON \
-DVTK_Group_MPI:BOOL=ON \
-DVTK_Group_Imaging:BOOL=ON \
-DVTK_Group_Qt:BOOL=ON \
-DModule_vtkTestingCore:BOOL=ON \
-DModule_vtkTestingRendering:BOOL=ON \
-DVTK_Group_Rendering:BOOL=ON \
-DVTK_Group_StandAlone:BOOL=ON \
-DVTK_Group_Tk:BOOL=ON \
-DVTK_Group_Views:BOOL=ON \
-DModule_vtkFiltersStatisticsGnuR:BOOL=ON \
-DVTK_WRAP_TCL:BOOL=ON \
-DVTK_USE_SYSTEM_HDF5:BOOL=ON \
-DVTK_USE_SYSTEM_NETCDF:BOOL=ON \
-DVTK_PYTHON_VERSION=3 \
-DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON \
-DVTK_USE_SYSTEM_DIY2=OFF \
-DVTK_USE_SYSTEM_GL2PS=OFF \
-DVTK_USE_SYSTEM_MPI4PY=ON
make %{?_smp_mflags} VERBOSE=1
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 "{}" "+"
popd
%install
pushd build
%makeinstall
# Gather list of non-binding libraries
ls %{buildroot}%{_libdir}/lib*.so.* | sed -e's,^%{buildroot},,' > libs.list
# List of executable examples
cat > examples.list << EOF
Generate2DAMRDataSetWithPulse
Generate3DAMRDataSetWithPulse
HierarchicalBoxPipeline
ImageSlicing
DumpXMLFile
ParticleReader
GenerateCubesFromLabels
GenerateModelsFromLabels
Medical1
Medical2
Medical3
Medical4
Delaunay3D
Delaunay3DAlpha
finance
MultiBlock
BandedContours
FilledContours
TubesWithVaryingRadiusAndColors
BalloonWidget
Slider
Slider2D
LabeledMesh
Arrays
Cube
RGrid
SGrid
AmbientSpheres
Cylinder
DiffuseSpheres
SpecularSpheres
Cone
Cone2
Cone3
Cone4
Cone5
Cone6
FixedPointVolumeRayCastMapperCT
GPURenderDemo
EOF
# Install examples
for file in `cat examples.list`; do
install -p bin/$file %{buildroot}%{_bindir}
done
perl -pi -e's,^,%{_bindir}/,' examples.list
# Remove rpaths from installed binaries
chrpath -d %{buildroot}%{_bindir}/*
%fdupes -s %{buildroot}
%post -n %{shlib} -p /sbin/ldconfig
%postun -n %{shlib} -p /sbin/ldconfig
%files -n %{shlib} -f build/libs.list
%defattr(-,root,root,-)
%files devel
%defattr(-,root,root,-)
%doc Copyright.txt
%{_bindir}/%{pkgname}EncodeString
%{_bindir}/%{pkgname}HashSource
%{_bindir}/%{pkgname}WrapHierarchy
%if %{compat_gl}
%{_bindir}/%{pkgname}ParseOGLExt
%endif
%{_bindir}/pvtk
%if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315
%{_bindir}/%{pkgname}mkg3states
%endif
%{_datadir}/doc/%{pkgname}-%{series}/
%{_libdir}/*.so
%if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315
%{_libdir}/libvtktiff.so
%endif
%{_libdir}/cmake/%{pkgname}/
%{_libdir}/libvtkWrappingTools.a
%{_includedir}/%{pkgname}-%{series}/
%exclude %{_datadir}/tcl/vtk/vtktcl.c
# This goes in the vtk-java subpackage, not a devel symlink
%exclude %{_libdir}/libvtkViewsGeovisJava.so
#
%files java
%defattr(-,root,root,-)
%{_bindir}/%{pkgname}ParseJava
%{_bindir}/%{pkgname}WrapJava
%{_libdir}/%{pkgname}.jar
%{_libdir}/libvtkViewsGeovisJava.so
%files -n python3-%{name}
%defattr(-,root,root,-)
%{_bindir}/%{pkgname}python
%{_bindir}/p%{pkgname}python
%{_bindir}/%{pkgname}WrapPython
%{_bindir}/%{pkgname}WrapPythonInit
%{python3_sitearch}/%{pkgname}/
%files tcl
%defattr(-,root,root,-)
%{_bindir}/%{pkgname}
%{_bindir}/%{pkgname}WrapTcl
%{_bindir}/%{pkgname}WrapTclInit
%{_datadir}/tcl/%{pkgname}/
%files qt
%defattr(-,root,root,-)
%dir %{_prefix}/%{qtdir}/plugins/designer
%{_prefix}/%{qtdir}/plugins/designer/libQVTKWidgetPlugin.so
%files examples -f build/examples.list
%defattr(-,root,root,-)
%changelog
++++++ vtk.spec ++++++
--- /var/tmp/diff_new_pack.c9ppVw/_old 2017-08-28 15:14:51.784134773 +0200
+++ /var/tmp/diff_new_pack.c9ppVw/_new 2017-08-28 15:14:51.788134212 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package vtk
+# spec file for package vtk-compat_gl
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,10 +16,25 @@
#
+%define compat_gl 0
+%define pkgname vtk
+%define vtklib lib%{pkgname}1
+%define vtkcompatlib libvtkcompat_gl1
+
+%if %{compat_gl}
+%define shlib %{vtkcompatlib}
+%else
+%define shlib %{vtklib}
+%endif
+
+%if %{compat_gl}
+Name: vtk-compat_gl
+%else
Name: vtk
-Version: 7.1.0
+%endif
+Version: 8.0.0
Release: 0
-%define series 7.1
+%define series 8.0
# 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
@@ -29,7 +44,12 @@
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
+%if %{compat_gl}
+Source1: vtk-compat_gl-rpmlintrc
+%else
Source1: vtk-rpmlintrc
+%endif
# PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch
badshah...@gmail.com -- Fix file containing DATE and TIME
Patch1: vtk-fix-file-contains-date-time.patch
# PATCH-FIX-UPSTREAM vtk-Rinterface-uintptr_t.patch boo#985386
badshah...@gmail.com -- Fix issues with uintptr_t redefinition by defining the
HAVE_UINTPTR_T macro using cmake functions to avoid redefinition of uintptr_t,
which is already defined in stdint.h called earlier; patch sent upstream
@@ -52,8 +72,10 @@
BuildRequires: libX11-devel
BuildRequires: libXt-devel
BuildRequires: libexpat-devel
+BuildRequires: libharu-devel
BuildRequires: libiodbc-devel
BuildRequires: libjpeg-devel
+BuildRequires: liblz4-devel >= 1.7.3
BuildRequires: libmysqlclient-devel
BuildRequires: libnetcdf_c++-devel
BuildRequires: libpng-devel
@@ -62,6 +84,7 @@
BuildRequires: netcdf-devel
BuildRequires: openmpi-devel
BuildRequires: python3-devel
+BuildRequires: python3-mpi4py-devel
BuildRequires: tcl-devel
BuildRequires: tk-devel
BuildRequires: wget
@@ -92,21 +115,34 @@
%else
%define qtdir %{_lib}/qt4
%endif
+Provides: python3-%{name}-qt = %{version}
%description
-VTK is an open-source 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).
+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
+%if %{compat_gl}
+Conflicts: %{vtklib}
+%else
+Conflicts: %{vtkcompatlib}
+%endif
+
+%description -n %{shlib}
+VTK is a software system for image processing, 3D graphics, volume
+rendering and visualization.
+
+This package provides the shared libraries for VTK.
%package devel
Summary: VTK header files for building C++ code
-Group: Development/Libraries/Other
-Requires: %{name} = %{version}
-Requires: %{name}-java = %{version}
-Requires: %{name}-qt = %{version}
-Requires: %{name}-tcl = %{version}
+Group: Development/Libraries/C and C++
+Requires: %{shlib} = %{version}
Requires: Mesa-libGL-devel
Requires: R-base-devel
Requires: gl2ps-devel
@@ -117,7 +153,9 @@
%endif
Requires: freetype2-devel
Requires: libexpat-devel
+Requires: libharu-devel
Requires: libjpeg-devel
+Requires: liblz4-devel
Requires: libmysqlclient-devel
Requires: libnetcdf_c++-devel
Requires: libogg-devel
@@ -127,15 +165,16 @@
Requires: libxml2-devel
Requires: netcdf-devel
Requires: openmpi-devel
-Requires: python3-%{name} = %{version}
-Requires: python3-%{name}-qt = %{version}
+%if %{compat_gl}
+Conflicts: vtk-devel
+Provides: vtk-devel
+%else
+Conflicts: vtk-compat_gl-devel
+%endif
%description devel
-VTK is an open-source 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).
+VTK is a software system for image processing, 3D graphics, volume
+rendering and visualization.
This provides the VTK header files required to compile C++ programs that
use VTK to do 3D visualisation.
@@ -143,119 +182,107 @@
%package java
Summary: Java bindings for VTK
Group: Development/Libraries/Java
-Requires: %{name} = %{version}
+Requires: %{shlib} = %{version}
+%if %{compat_gl}
+Conflicts: vtk-java
+Provides: vtk-java
+%else
+Conflicts: vtk-compat_gl-java
+%endif
%description java
-VTK is an open-source 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).
+VTK is a software system for image processing, 3D graphics, volume
+rendering and visualization.
This package provides java bindings for VTK.
%package -n python3-%{name}
Summary: Python bindings for VTK
-Group: System/Libraries
-Requires: %{name} = %{version}
+Group: Development/Languages/Python
+Requires: %{shlib} = %{version}
# DESPITE NOT BEING A DEVEL PACKAGE, THIS REQUIRES OPENMPI-DEVEL TO RUN
Requires: openmpi-devel
+%if %{compat_gl}
+Conflicts: python3-vtk
+Provides: python3-vtk
+%else
+Conflicts: python3-vtk-compat_gl
+%endif
%description -n python3-%{name}
-VTK is an open-source 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).
+VTK is a software system for image processing, 3D graphics, volume
+rendering and visualization.
This package provides python bindings for VTK.
-%package -n python3-%{name}-qt
-Summary: Qt Python VTK widget
-Group: System/Libraries
-Requires: %{name} = %{version}
-Requires: %{name}-qt = %{version}
-Requires: python3-%{name} = %{version}
-%if 0%{?suse_version} > 1320
-Requires: libQt5OpenGL-devel
-Requires: libQt5OpenGLExtensions-devel-static
-Requires: libQt5Sql-devel
-Requires: libQt5WebKitWidgets-devel
-Requires: libQt5Widgets-devel
-Requires: python3-qt5
-%else
-Requires: libqt4-devel
-Requires: python3-qt4
-%endif
-# CONFLICTS IS FOR A PKG (python-vtk) IN SCIENCE THAT IS NOT INTENDED TO BE
INCLUDED IN openSUSE:FACTORY
-Conflicts: python-vtk
-
-%description -n python3-%{name}-qt
-VTK is an open-source 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-qt bindings for VTK.
-
%package qt
Summary: Qt VTK widget
Group: Development/Libraries/C and C++
-Requires: %{name} = %{version}
+Requires: %{shlib} = %{version}
+%if %{compat_gl}
+Conflicts: vtk-qt
+Provides: vtk-qt
+%else
+Conflicts: vtk-compat_gl-qt
+%endif
%description qt
-VTK is an open-source 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).
+VTK is a software system for image processing, 3D graphics, volume
+rendering and visualization.
This package provides Qt bindings for VTK.
%package tcl
Summary: Tcl bindings for VTK
-Group: System/Libraries
-Requires: %{name} = %{version}
+Group: Development/Languages/Tcl
+Requires: %{shlib} = %{version}
+%if %{compat_gl}
+Conflicts: vtk-tcl
+Provides: vtk-tcl
+%else
+Conflicts: vtk-compat_gl-tcl
+%endif
%description tcl
-VTK is an open-source 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).
+VTK is a software system for image processing, 3D graphics, volume
+rendering and visualization.
This package provides tcl bindings for VTK.
%package examples
Summary: Examples for VTK
Group: Productivity/Scientific/Other
-Requires: %{name} = %{version}
+Requires: %{shlib} = %{version}
Recommends: %{name}data = %{version}
+%if %{compat_gl}
+Conflicts: vtk-examples
+Provides: vtk-examples
+%else
+Conflicts: vtk-compat_gl-examples
+%endif
%description examples
-VTK is an open-source 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 well-commented examples showing how to use
-VTK. Examples are available in the C++, Tcl, Python and Java
-programming languages.
+VTK is a software system for image processing, 3D graphics, volume
+rendering and visualization.
+
+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} = %{version}
Requires: %{name}data = %{version}
+Requires: %{shlib} = %{version}
+%if %{compat_gl}
+Conflicts: vtk-testing
+Provides: vtk-testing
+%else
+Conflicts: vtk-compat_gl-testing
+%endif
%description testing
-VTK is an open-source 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).
+VTK is a software system for image processing, 3D graphics, volume
+rendering and visualization.
This package provides a few testing programs for VTK.
@@ -264,9 +291,9 @@
%patch1 -p1
%patch2 -p1
-# Replace relative path ../../../VTKData with
%%{_datadir}/%%{name}data-%%{version}
+# Replace relative path ../../../VTKData with
%%{_datadir}/%%{pkgname}data-%%{version}
# otherwise it will break on symlinks.
-grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs perl -pi
-e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/%{name},g'
+grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs -r perl -pi
-e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/%{pkgname},g'
%build
export CFLAGS="%{optflags}"
@@ -285,16 +312,19 @@
-DVTK_CUSTOM_LIBRARY_SUFFIX="" \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DSIP_INCLUDE_DIR:Path=%{py3_incdir} \
- -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/%{name} \
- -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/%{name}\
- -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{name} \
- -DVTK_INSTALL_TCL_DIR:PATH=share/tcl/%{name} \
+ -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib} \
+ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib} \
+ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{pkgname} \
+ -DVTK_INSTALL_TCL_DIR:PATH=share/tcl/%{pkgname} \
%if 0%{?suse_version} > 1320
-DVTK_QT_VERSION=5 \
%endif
-DVTK_INSTALL_QT_DIR:STRING=/%{qtdir}/plugins/designer \
-DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \
-DVTK_USE_RENDERING:BOOL=ON \
+%if %{compat_gl}
+ -DVTK_RENDERING_BACKEND:STRING='OpenGL' \
+%endif
%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315
-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
%else
@@ -322,24 +352,22 @@
-DVTK_PYTHON_VERSION=3 \
-DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON \
-DVTK_USE_SYSTEM_DIY2=OFF \
- -DVTK_USE_SYSTEM_GL2PS=OFF
+ -DVTK_USE_SYSTEM_GL2PS=OFF \
+ -DVTK_USE_SYSTEM_MPI4PY=ON
make %{?_smp_mflags} VERBOSE=1
+make %{?_smp_mflags} DoxygenDoc
# Remove executable bits from sources (some of which are generated)
-find . -name \*.c -or -name \*.cxx -or -name \*.h -or -name \*.hxx -or -name
\*.gif | xargs chmod -x
+find . -name \*.c -o -name \*.cxx -o -name \*.h -o -name \*.hxx -o -name
\*.gif -exec chmod -x "{}" "+"
popd
%install
pushd build
%makeinstall
-# Install conf file to enable vtk to find its libraries
-mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d
-echo %{_libdir}/%{name} > %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
-
# Gather list of non-binding libraries
-ls %{buildroot}%{_libdir}/%{name}/lib*.so.* | grep -Ev
'(Java|QVTK|Qt|Python|TCL)' | sed -e's,^%{buildroot},,' > libs.list
+ls %{buildroot}%{_libdir}/lib*.so.* | sed -e's,^%{buildroot},,' > libs.list
# List of executable examples
cat > examples.list << EOF
@@ -395,91 +423,64 @@
%fdupes -s %{buildroot}
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post java -p /sbin/ldconfig
-%postun java -p /sbin/ldconfig
-
-%post -n python3-%{name} -p /sbin/ldconfig
-%postun -n python3-%{name} -p /sbin/ldconfig
+%post -n %{shlib} -p /sbin/ldconfig
+%postun -n %{shlib} -p /sbin/ldconfig
-%post -n python3-%{name}-qt -p /sbin/ldconfig
-%postun -n python3-%{name}-qt -p /sbin/ldconfig
-
-%post qt -p /sbin/ldconfig
-%postun qt -p /sbin/ldconfig
-
-%post tcl -p /sbin/ldconfig
-%postun tcl -p /sbin/ldconfig
-
-%files -f build/libs.list
+%files -n %{shlib} -f build/libs.list
%defattr(-,root,root,-)
-%config %{_sysconfdir}/ld.so.conf.d/%{name}.conf
-%doc Copyright.txt
-%dir %{_libdir}/%{name}/
-%if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315
-%{_libdir}/libvtktiff.so.*
-%endif
%files devel
%defattr(-,root,root,-)
-%{_bindir}/%{name}EncodeString
-%{_bindir}/%{name}HashSource
-%{_bindir}/%{name}WrapHierarchy
+%doc Copyright.txt
+%{_bindir}/%{pkgname}EncodeString
+%{_bindir}/%{pkgname}HashSource
+%{_bindir}/%{pkgname}WrapHierarchy
+%if %{compat_gl}
+%{_bindir}/%{pkgname}ParseOGLExt
+%endif
%{_bindir}/pvtk
%if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315
-%{_bindir}/%{name}mkg3states
+%{_bindir}/%{pkgname}mkg3states
%endif
-%{_datadir}/doc/%{name}-%{series}/
-%{_libdir}/%{name}/*.so
+%{_datadir}/doc/%{pkgname}-%{series}/
+%{_libdir}/*.so
%if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315
%{_libdir}/libvtktiff.so
%endif
-%{_libdir}/cmake/%{name}/
-%{_libdir}/%{name}/libvtkWrappingTools.a
-%{_includedir}/%{name}-%{series}/
-%{_datadir}/tcl/vtk/vtktcl.c
+%{_libdir}/cmake/%{pkgname}/
+%{_libdir}/libvtkWrappingTools.a
+%{_includedir}/%{pkgname}-%{series}/
+%exclude %{_datadir}/tcl/vtk/vtktcl.c
+# This goes in the vtk-java subpackage, not a devel symlink
+%exclude %{_libdir}/libvtkViewsGeovisJava.so
+#
%files java
%defattr(-,root,root,-)
-%{_bindir}/%{name}ParseJava
-%{_bindir}/%{name}WrapJava
-%{_libdir}/%{name}/%{name}.jar
-%{_libdir}/%{name}/*Java.so.*
+%{_bindir}/%{pkgname}ParseJava
+%{_bindir}/%{pkgname}WrapJava
+%{_libdir}/%{pkgname}.jar
+%{_libdir}/libvtkViewsGeovisJava.so
%files -n python3-%{name}
%defattr(-,root,root,-)
-%{_bindir}/%{name}python
-%{_bindir}/p%{name}python
-%{_bindir}/%{name}WrapPython
-%{_bindir}/%{name}WrapPythonInit
-%{_libdir}/%{name}/*Python*.so.*
-%{python3_sitearch}/%{name}/
-%dir %{_libdir}/%{name}/site-packages
-%{_libdir}/%{name}/site-packages/mpi4py/
-%exclude %{_libdir}/%{name}/*QtPython*.so.*
+%{_bindir}/%{pkgname}python
+%{_bindir}/p%{pkgname}python
+%{_bindir}/%{pkgname}WrapPython
+%{_bindir}/%{pkgname}WrapPythonInit
+%{python3_sitearch}/%{pkgname}/
%files tcl
%defattr(-,root,root,-)
-%{_bindir}/%{name}
-%{_bindir}/%{name}WrapTcl
-%{_bindir}/%{name}WrapTclInit
-%{_datadir}/tcl/%{name}/
-%{_libdir}/%{name}/lib%{name}*TCL.so.*
-%exclude %{_libdir}/%{name}/*QtTCL.so.*
-%exclude %{_datadir}/tcl/vtk/vtktcl.c
+%{_bindir}/%{pkgname}
+%{_bindir}/%{pkgname}WrapTcl
+%{_bindir}/%{pkgname}WrapTclInit
+%{_datadir}/tcl/%{pkgname}/
%files qt
%defattr(-,root,root,-)
-%{_libdir}/%{name}/lib*Qt*.so.*
%dir %{_prefix}/%{qtdir}/plugins/designer
%{_prefix}/%{qtdir}/plugins/designer/libQVTKWidgetPlugin.so
-%exclude %{_libdir}/%{name}/*Python*.so.*
-
-%files -n python3-%{name}-qt
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/*QtPython*.so.*
%files examples -f build/examples.list
%defattr(-,root,root,-)
++++++ VTK-7.1.0.tar.gz -> VTK-8.0.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/vtk/VTK-7.1.0.tar.gz
/work/SRC/openSUSE:Factory/.vtk.new/VTK-8.0.0.tar.gz differ: char 5, line 1
++++++ pre_checkin.sh ++++++
#!/bin/sh
sed 's|%define compat_gl 0|%define compat_gl 1|' vtk.spec > vtk-compat_gl.spec
cp vtk-rpmlintrc vtk-compat_gl-rpmlintrc
cp vtk.changes vtk-compat_gl.changes
++++++ vtk-Rinterface-uintptr_t.patch ++++++
--- /var/tmp/diff_new_pack.c9ppVw/_old 2017-08-28 15:14:52.052097124 +0200
+++ /var/tmp/diff_new_pack.c9ppVw/_new 2017-08-28 15:14:52.052097124 +0200
@@ -1,8 +1,8 @@
-Index: VTK-7.0.0/Filters/StatisticsGnuR/CMakeLists.txt
+Index: VTK-8.0.0/Filters/StatisticsGnuR/CMakeLists.txt
===================================================================
---- VTK-7.0.0.orig/Filters/StatisticsGnuR/CMakeLists.txt
-+++ VTK-7.0.0/Filters/StatisticsGnuR/CMakeLists.txt
-@@ -16,6 +16,10 @@ include_directories(${R_INCLUDE_DIR})
+--- VTK-8.0.0.orig/Filters/StatisticsGnuR/CMakeLists.txt
++++ VTK-8.0.0/Filters/StatisticsGnuR/CMakeLists.txt
+@@ -27,6 +27,10 @@ include_directories(${R_INCLUDE_DIR})
add_definitions(-DVTK_BUILDING_FILTERS_STATISTICSGNUR)
@@ -13,10 +13,10 @@
# Configure the module specific settings into a module configured header.
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vtkFiltersStatisticsGnuRConfigure.h.in
${CMAKE_CURRENT_BINARY_DIR}/vtkFiltersStatisticsGnuRConfigure.h)
-Index: VTK-7.0.0/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in
+Index: VTK-8.0.0/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in
===================================================================
----
VTK-7.0.0.orig/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in
-+++ VTK-7.0.0/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in
+---
VTK-8.0.0.orig/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in
++++ VTK-8.0.0/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in
@@ -17,5 +17,6 @@
#define vtkFiltersStatisticsGnuRConfigure_h
++++++ vtk-compat_gl-rpmlintrc ++++++
# 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")
# Upstream does not supply manuals for any binary, suppress warnings
addFilter(".* no-manual-page-for-binary")
# This is not a versioned shared lib, and not used by anything other than
# vtk's java bindings, simply package it with the vtk-java subpackage
addFilter("vtk-java.* shlib-policy-name-error")
addFilter("vtk-compat_gl-java.* shlib-policy-name-error")
++++++ vtk-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.c9ppVw/_old 2017-08-28 15:14:52.232071837 +0200
+++ /var/tmp/diff_new_pack.c9ppVw/_new 2017-08-28 15:14:52.232071837 +0200
@@ -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* devel-file-in-non-devel-package")
# Upstream does not supply manuals for any binary, suppress warnings
addFilter(".* no-manual-page-for-binary")
+
+# This is not a versioned shared lib, and not used by anything other than
+# vtk's java bindings, simply package it with the vtk-java subpackage
+addFilter("vtk-java.* shlib-policy-name-error")
+addFilter("vtk-compat_gl-java.* shlib-policy-name-error")
