diff --git a/VTK-6.1.0.tar.gz b/VTK-6.1.0.tar.gz deleted file mode 100644 index 3c45924..0000000 --- a/VTK-6.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd7df10a479606d529a8b71f466c44a2bdd11fd534c62ce0aa44fad91883fa34 -size 27608882 diff --git a/VTK-6.2.0.tar.gz b/VTK-6.2.0.tar.gz new file mode 100644 index 0000000..913c834 --- /dev/null +++ b/VTK-6.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efa3ddfba118f3988ead08bdaf9441d33f23a4245d78511a6ce7f267b4f13277 +size 30114472 diff --git a/vtk-Mesa10.3-build-failures.patch b/vtk-Mesa10.3-build-failures.patch deleted file mode 100644 index 42c9439..0000000 --- a/vtk-Mesa10.3-build-failures.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: VTK-6.1.0/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx -=================================================================== ---- VTK-6.1.0.orig/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx -+++ VTK-6.1.0/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx -@@ -27,7 +27,7 @@ - - // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by - // the system --//#define GLX_GLXEXT_LEGACY -+#define GLX_GLXEXT_LEGACY - #include "GL/glx.h" - - #include "vtkgl.h" diff --git a/vtk-install-missing-modules.patch b/vtk-install-missing-modules.patch deleted file mode 100644 index ea362d4..0000000 --- a/vtk-install-missing-modules.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: VTK-6.1.0/CMake/vtkModuleTop.cmake -=================================================================== ---- VTK-6.1.0.orig/CMake/vtkModuleTop.cmake -+++ VTK-6.1.0/CMake/vtkModuleTop.cmake -@@ -330,9 +330,11 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT) - CMake/pythonmodules.h.in - CMake/UseVTK.cmake - CMake/FindTCL.cmake -+ CMake/TopologicalSort.cmake - CMake/vtkTclTkMacros.cmake - CMake/vtk-forward.c.in - CMake/vtkForwardingExecutable.cmake -+ CMake/vtkGroups.cmake - CMake/vtkJavaWrapping.cmake - CMake/vtkMakeInstantiator.cmake - CMake/vtkModuleAPI.cmake diff --git a/vtk-rpmlintrc b/vtk-rpmlintrc new file mode 100644 index 0000000..c4bd163 --- /dev/null +++ b/vtk-rpmlintrc @@ -0,0 +1,3 @@ +# 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") diff --git a/vtk-system.patch b/vtk-system.patch deleted file mode 100644 index fc22a76..0000000 --- a/vtk-system.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: VTK6.0.0/CMake/vtkModuleMacros.cmake -=================================================================== ---- VTK6.0.0.orig/CMake/vtkModuleMacros.cmake -+++ VTK6.0.0/CMake/vtkModuleMacros.cmake -@@ -613,7 +613,7 @@ macro(vtk_module_third_party _pkg) - message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES") - endif() - -- option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF) -+ option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES}) - mark_as_advanced(VTK_USE_SYSTEM_${_upper}) - - if(VTK_USE_SYSTEM_${_upper}) -Index: VTK6.0.0/CMakeLists.txt -=================================================================== ---- VTK6.0.0.orig/CMakeLists.txt -+++ VTK6.0.0/CMakeLists.txt -@@ -132,6 +132,11 @@ if (CMAKE_CROSSCOMPILING AND NOT COMPILE - endif() - - #----------------------------------------------------------------------------- -+# Do we try to use system libraries by default? -+OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF) -+MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES) -+ -+#----------------------------------------------------------------------------- - # The third party macros are still used in one or two third party builds. - include(vtkThirdParty) - diff --git a/vtk.changes b/vtk.changes index 9f7fff6..f4371e8 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Mar 13 19:50:12 UTC 2015 - badshah400@gmail.com + +- Update to version 6.2.0: + + See http://www.kitware.com/blog/home/post/858 for a list of + changes. +- Drop patches incorporated upstream: + + vtk-install-missing-modules.patch + + vtk-Mesa10.3-build-failures.patch + + vtk-system.patch. +- Update filelist to incorporate new files installed by upstream. +- Use system hdf5 and netcdf on all openSUSE versions. +- Build on openSUSE > 13.2 with system libraries ON (except + for libproj4); all required depndencies for this purpose are + now in Factory. +- Add rpmlintrc file to suppress + "devel-files-in-non-devel-package" warning; python-vtk needs + these devel files for its own functioning. + ------------------------------------------------------------------- Thu Feb 26 12:30:11 UTC 2015 - dkxls23@gmail.com diff --git a/vtk.spec b/vtk.spec index e2bb92f..4f0d3c5 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,9 +17,9 @@ Name: vtk -Version: 6.1.0 +Version: 6.2.0 Release: 0 -%define series 6.1 +%define series 6.2 # 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 @@ -28,14 +28,10 @@ License: BSD-3-Clause Group: Productivity/Scientific/Other Url: http://vtk.org/ Source: http://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.gz -# PATCH-FIX-UPSTREAM vtk-system.patch badshah400@gmail.com -- Use system libraries, http://public.kitware.com/Bug/view.php?id=11823 -Patch0: vtk-system.patch +# FIXME See if packaging can be tweaked to accommodate python-vtk's devel files in a devel package later +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-install-missing-modules.patch badshah400@gmail.com -- Install some cmake modules missed in upstream packaging (will be required if in future we can get paraview to use system installed vtk) -Patch2: vtk-install-missing-modules.patch -# PATCH-FIX-UPSTREAM vtk-Mesa10.3-build-failures.patch badshah400@gmail.com -- Actually define GLX_GLXEXT_LEGACY to prevent the system glext.h include; fixes buld failures with Mesa >= 10.3; fix taken from upstream git and rebased -Patch3: vtk-Mesa10.3-build-failures.patch BuildRequires: Mesa-libGL-devel BuildRequires: R-base-devel BuildRequires: boost-devel @@ -57,10 +53,12 @@ BuildRequires: libexpat-devel BuildRequires: libiodbc-devel BuildRequires: libjpeg-devel BuildRequires: libmysqlclient-devel +BuildRequires: libnetcdf_c++-devel BuildRequires: libpng-devel BuildRequires: libqt4-devel BuildRequires: libtheora-devel BuildRequires: libtiff-devel +BuildRequires: netcdf-devel BuildRequires: openmpi-devel BuildRequires: python-devel BuildRequires: python-qt4-devel @@ -73,6 +71,10 @@ BuildRequires: libxml2-devel %else BuildRequires: pkgconfig(libxml-2.0) %endif +# jsoncpp available for openSUSE > 13.2 +%if 0%{?suse_version} > 1320 +BuildRequires: jsoncpp-devel +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %define qtdir %{_lib}/qt4 @@ -225,12 +227,7 @@ This package provides a few testing programs for VTK. %prep %setup -q -n VTK-%{version} -%patch0 -p1 %patch1 -p1 -%patch2 -p1 -%if 0%{?suse_version} > 1310 -%patch3 -p1 -%endif # Replace relative path ../../../VTKData with %%{_datadir}/%%{name}data-%%{version} # otherwise it will break on symlinks. @@ -259,7 +256,11 @@ cmake .. \ -DVTK_INSTALL_QT_DIR:STRING=/%{qtdir}/plugins/designer \ -DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \ -DVTK_USE_RENDERING:BOOL=ON \ +%if 0%{?suse_version} > 1320 + -DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \ +%else -DVTK_USE_SYSTEM_LIBRARIES:BOOL=OFF \ +%endif -DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \ %if 0%{?suse_version} <= 1230 -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF \ @@ -279,7 +280,9 @@ cmake .. \ -DVTK_Group_Tk:BOOL=ON \ -DVTK_Group_Views:BOOL=ON \ -DModule_vtkFiltersStatisticsGnuR:BOOL=ON \ - -DVTK_WRAP_TCL:BOOL=ON + -DVTK_WRAP_TCL:BOOL=ON \ + -DVTK_USE_SYSTEM_HDF5:BOOL=ON \ + -DVTK_USE_SYSTEM_NETCDF:BOOL=ON make %{?_smp_mflags} VERBOSE=1 @@ -385,7 +388,9 @@ chrpath -d %{buildroot}%{_bindir}/* %{_bindir}/%{name}HashSource %{_bindir}/%{name}ParseOGLExt %{_bindir}/%{name}WrapHierarchy +%if 0%{?suse_version} <= 1320 %{_bindir}/%{name}mkg3states +%endif %{_datadir}/doc/%{name}-%{series}/ %{_libdir}/%{name}/*.so %{_libdir}/cmake/%{name}/ @@ -409,6 +414,8 @@ chrpath -d %{buildroot}%{_bindir}/* %{_bindir}/%{name}WrapPythonInit %{_libdir}/%{name}/*Python*.so.* %{python_sitearch}/%{name}/ +%dir %{_libdir}/%{name}/site-packages +%{_libdir}/%{name}/site-packages/mpi4py/ %exclude %{_libdir}/%{name}/*QtPython27D.so.* %files tcl