Hello community,
here is the log from the commit of package vtk for openSUSE:Factory checked in at 2016-02-25 22:05:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vtk (Old)
and /work/SRC/openSUSE:Factory/.vtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vtk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vtk/vtk.changes 2015-09-19 06:55:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vtk.new/vtk.changes 2016-02-26 00:47:02.000000000 +0100
@@ -1,0 +2,21 @@
+Wed Feb 17 01:13:12 UTC 2016 - badshah400@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
+ 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.
+
+-------------------------------------------------------------------
Old:
----
VTK-6.3.0.tar.gz
New:
----
VTK-7.0.0.tar.gz
vtk-Rinterface-uintptr_t.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vtk.spec ++++++
--- /var/tmp/diff_new_pack.RSgRR8/_old 2016-02-26 00:47:04.000000000 +0100
+++ /var/tmp/diff_new_pack.RSgRR8/_new 2016-02-26 00:47:04.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package vtk
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -17,9 +17,9 @@
Name: vtk
-Version: 6.3.0
+Version: 7.0.0
Release: 0
-%define series 6.3
+%define series 7.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
@@ -32,6 +32,8 @@
Source1: vtk-rpmlintrc
# PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch badshah400@gmail.com -- Fix file containing DATE and TIME
Patch1: vtk-fix-file-contains-date-time.patch
+# PATCH-FIX-UPSTREAM vtk-Rinterface-uintptr_t.patch badshah400@gmail.com -- Only use uintptr_t definition from R headers; no longer include stdint.h
+Patch2: vtk-Rinterface-uintptr_t.patch
BuildRequires: Mesa-libGL-devel
BuildRequires: R-base-devel
BuildRequires: boost-devel
@@ -59,14 +61,13 @@
BuildRequires: libtiff-devel
BuildRequires: netcdf-devel
BuildRequires: openmpi-devel
-BuildRequires: python-devel
-
+BuildRequires: python3-devel
BuildRequires: tcl-devel
BuildRequires: tk-devel
BuildRequires: wget
BuildRequires: zlib-devel
%if 0%{?suse_version} > 1320
-BuildRequires: python-qt5-devel
+BuildRequires: python3-qt5-devel
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5OpenGLExtensions)
BuildRequires: pkgconfig(Qt5Sql)
@@ -74,7 +75,7 @@
BuildRequires: pkgconfig(Qt5Widgets)
%else
BuildRequires: libqt4-devel
-BuildRequires: python-qt4-devel
+BuildRequires: python3-qt4-devel
%endif
%if %{?sles_version}
BuildRequires: libxml2-devel
@@ -125,8 +126,8 @@
Requires: libxml2-devel
Requires: netcdf-devel
Requires: openmpi-devel
-Requires: python-%{name} = %{version}
-Requires: python-%{name}-qt = %{version}
+Requires: python3-%{name} = %{version}
+Requires: python3-%{name}-qt = %{version}
%description devel
VTK is an open-source software system for image processing, 3D
@@ -152,16 +153,15 @@
This package provides java bindings for VTK.
-%package -n python-%{name}
+%package -n python3-%{name}
Summary: Python bindings for VTK
Group: System/Libraries
Requires: %{name} = %{version}
# DESPITE NOT BEING A DEVEL PACKAGE, THIS REQUIRES OPENMPI-DEVEL TO RUN
Requires: openmpi-devel
Requires: openmpi-libs
-%{py_requires}
-%description -n python-%{name}
+%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,
@@ -170,26 +170,25 @@
This package provides python bindings for VTK.
-%package -n python-%{name}-qt
+%package -n python3-%{name}-qt
Summary: Qt Python VTK widget
Group: System/Libraries
Requires: %{name} = %{version}
Requires: %{name}-qt = %{version}
-Requires: python-%{name} = %{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: python-qt5
+Requires: python3-qt5
%else
Requires: libqt4-devel
-Requires: python-qt4
+Requires: python3-qt4
%endif
-%{py_requires}
-%description -n python-%{name}-qt
+%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,
@@ -261,6 +260,7 @@
%prep
%setup -q -n VTK-%{version}
%patch1 -p1
+%patch2 -p1
# Replace relative path ../../../VTKData with %%{_datadir}/%%{name}data-%%{version}
# otherwise it will break on symlinks.
@@ -281,7 +281,7 @@
-DBUILD_TESTING:BOOL=OFF \
-DVTK_CUSTOM_LIBRARY_SUFFIX="" \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
- -DSIP_INCLUDE_DIR:Path=%{py_incdir} \
+ -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} \
@@ -298,10 +298,7 @@
-DVTK_USE_SYSTEM_LIBRARIES:BOOL=OFF \
%endif
-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \
-%if 0%{?suse_version} <= 1230
- -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF \
-%endif
- -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{py_ver}/site-packages \
+ -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 \
@@ -318,7 +315,8 @@
-DModule_vtkFiltersStatisticsGnuR:BOOL=ON \
-DVTK_WRAP_TCL:BOOL=ON \
-DVTK_USE_SYSTEM_HDF5:BOOL=ON \
- -DVTK_USE_SYSTEM_NETCDF:BOOL=ON
+ -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \
+ -DVTK_PYTHON_VERSION=3
make %{?_smp_mflags} VERBOSE=1
@@ -342,14 +340,6 @@
Generate2DAMRDataSetWithPulse
Generate3DAMRDataSetWithPulse
HierarchicalBoxPipeline
-LabeledMesh
-MultiBlock
-Arrays
-Cube
-RGrid
-SGrid
-ImageDataLIC2DDemo
-StructuredGridLIC2DDemo
ImageSlicing
DumpXMLFile
ParticleReader
@@ -362,25 +352,30 @@
Delaunay3D
Delaunay3DAlpha
finance
+MultiBlock
+BandedContours
+FilledContours
+TubesWithVaryingRadiusAndColors
+BalloonWidget
+Slider
+Slider2D
+LabeledMesh
+Arrays
+Cube
+RGrid
+SGrid
AmbientSpheres
Cylinder
DiffuseSpheres
SpecularSpheres
-SurfaceLICDemo
Cone
Cone2
Cone3
Cone4
Cone5
Cone6
-BandedContours
-FilledContours
-TubesWithVaryingRadiusAndColors
FixedPointVolumeRayCastMapperCT
GPURenderDemo
-BalloonWidget
-Slider
-Slider2D
EOF
# Install examples
@@ -400,11 +395,11 @@
%post java -p /sbin/ldconfig
%postun java -p /sbin/ldconfig
-%post -n python-%{name} -p /sbin/ldconfig
-%postun -n python-%{name} -p /sbin/ldconfig
+%post -n python3-%{name} -p /sbin/ldconfig
+%postun -n python3-%{name} -p /sbin/ldconfig
-%post -n python-%{name}-qt -p /sbin/ldconfig
-%postun -n python-%{name}-qt -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
@@ -422,7 +417,6 @@
%defattr(-,root,root,-)
%{_bindir}/%{name}EncodeString
%{_bindir}/%{name}HashSource
-%{_bindir}/%{name}ParseOGLExt
%{_bindir}/%{name}WrapHierarchy
%if 0%{?suse_version} <= 1320
%{_bindir}/%{name}mkg3states
@@ -442,17 +436,17 @@
%{_libdir}/%{name}/%{name}.jar
%{_libdir}/%{name}/*Java.so.*
-%files -n python-%{name}
+%files -n python3-%{name}
%defattr(-,root,root,-)
%{_bindir}/%{name}python
%{_bindir}/p%{name}python
%{_bindir}/%{name}WrapPython
%{_bindir}/%{name}WrapPythonInit
%{_libdir}/%{name}/*Python*.so.*
-%{python_sitearch}/%{name}/
+%{python3_sitearch}/%{name}/
%dir %{_libdir}/%{name}/site-packages
%{_libdir}/%{name}/site-packages/mpi4py/
-%exclude %{_libdir}/%{name}/*QtPython27D.so.*
+%exclude %{_libdir}/%{name}/*QtPython*.so.*
%files tcl
%defattr(-,root,root,-)
@@ -469,11 +463,11 @@
%{_libdir}/%{name}/lib*Qt*.so.*
%dir %{_prefix}/%{qtdir}/plugins/designer
%{_prefix}/%{qtdir}/plugins/designer/libQVTKWidgetPlugin.so
-%exclude %{_libdir}/%{name}/*Python27D.so.*
+%exclude %{_libdir}/%{name}/*Python*.so.*
-%files -n python-%{name}-qt
+%files -n python3-%{name}-qt
%defattr(-,root,root,-)
-%{_libdir}/%{name}/*QtPython27D.so.*
+%{_libdir}/%{name}/*QtPython*.so.*
%files examples -f build/examples.list
%defattr(-,root,root,-)
++++++ VTK-6.3.0.tar.gz -> VTK-7.0.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/vtk/VTK-6.3.0.tar.gz /work/SRC/openSUSE:Factory/.vtk.new/VTK-7.0.0.tar.gz differ: char 5, line 1
++++++ vtk-Rinterface-uintptr_t.patch ++++++
Index: VTK-7.0.0/Filters/StatisticsGnuR/vtkRInterface.cxx
===================================================================
--- VTK-7.0.0.orig/Filters/StatisticsGnuR/vtkRInterface.cxx
+++ VTK-7.0.0/Filters/StatisticsGnuR/vtkRInterface.cxx
@@ -20,12 +20,15 @@
#include "vtkRInterface.h"
+// uintptr_t is already defined in recent versions of R which therefore causes a
+// clash when the same symbol is redefined in stddef.h
+
// for uintptr_t
-#ifdef _MSC_VER
-#include
-#else
-#include
-#endif
+// #ifdef _MSC_VER
+// #include
+// #else
+// #include
+// #endif
#include "vtkInformation.h"
#include "vtkInformationVector.h"
++++++ vtk-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.RSgRR8/_old 2016-02-26 00:47:04.000000000 +0100
+++ /var/tmp/diff_new_pack.RSgRR8/_new 2016-02-26 00:47:04.000000000 +0100
@@ -1,3 +1,6 @@
# FIXME: See if packaging can be tweaked to avoid these warnings later
# python-vtk needs these devel files to work
-addFilter("python-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")