From 6221fd827e1c7f0189964dd3b972354d9933f210c5c19d3211948684bad91a9c Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Sun, 21 Feb 2016 12:14:22 +0000 Subject: [PATCH] Accepting request 360188 from home:badshah400:branches:science Update to version 7.0.0 (mention new patch in changelog). OBS-URL: https://build.opensuse.org/request/show/360188 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=67 --- VTK-6.3.0.tar.gz | 3 -- VTK-7.0.0.tar.gz | 3 ++ vtk-Rinterface-uintptr_t.patch | 25 +++++++++ vtk-rpmlintrc | 5 +- vtk.changes | 21 ++++++++ vtk.spec | 94 ++++++++++++++++------------------ 6 files changed, 97 insertions(+), 54 deletions(-) delete mode 100644 VTK-6.3.0.tar.gz create mode 100644 VTK-7.0.0.tar.gz create mode 100644 vtk-Rinterface-uintptr_t.patch diff --git a/VTK-6.3.0.tar.gz b/VTK-6.3.0.tar.gz deleted file mode 100644 index 4df82b3..0000000 --- a/VTK-6.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92a493354c5fa66bea73b5fc014154af5d9f3f6cee8d20a826f4cd5d4b0e8a5e -size 30385070 diff --git a/VTK-7.0.0.tar.gz b/VTK-7.0.0.tar.gz new file mode 100644 index 0000000..9be9259 --- /dev/null +++ b/VTK-7.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78a990a15ead79cdc752e86b83cfab7dbf5b7ef51ba409db02570dbdd9ec32c3 +size 30659751 diff --git a/vtk-Rinterface-uintptr_t.patch b/vtk-Rinterface-uintptr_t.patch new file mode 100644 index 0000000..c2aedfd --- /dev/null +++ b/vtk-Rinterface-uintptr_t.patch @@ -0,0 +1,25 @@ +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" diff --git a/vtk-rpmlintrc b/vtk-rpmlintrc index c4bd163..719311b 100644 --- a/vtk-rpmlintrc +++ b/vtk-rpmlintrc @@ -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") diff --git a/vtk.changes b/vtk.changes index 5d2d0c9..4e52b26 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Fri Sep 18 09:11:38 UTC 2015 - badshah400@gmail.com diff --git a/vtk.spec b/vtk.spec index 529b24f..21aa787 100644 --- a/vtk.spec +++ b/vtk.spec @@ -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 @@ Source: http://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.gz 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: libtheora-devel 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(Qt5WebKitWidgets) 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: libtiff-devel 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 @@ volume rendering, LOD control). 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 @@ volume rendering, LOD control). 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 @@ 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}/%%{name}data-%%{version} # otherwise it will break on symlinks. @@ -281,7 +281,7 @@ cmake .. \ -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 @@ cmake .. \ -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 @@ cmake .. \ -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 @@ cat > examples.list << EOF Generate2DAMRDataSetWithPulse Generate3DAMRDataSetWithPulse HierarchicalBoxPipeline -LabeledMesh -MultiBlock -Arrays -Cube -RGrid -SGrid -ImageDataLIC2DDemo -StructuredGridLIC2DDemo ImageSlicing DumpXMLFile ParticleReader @@ -362,25 +352,30 @@ Medical4 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 @@ chrpath -d %{buildroot}%{_bindir}/* %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 @@ chrpath -d %{buildroot}%{_bindir}/* %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 @@ chrpath -d %{buildroot}%{_bindir}/* %{_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 @@ chrpath -d %{buildroot}%{_bindir}/* %{_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,-)