Accepting request 441895 from home:badshah400:branches:science

* 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). OBS-URL: https://build.opensuse.org/request/show/441895 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=79
2016-11-25 20:14:23 +00:00 · 2016-11-25 20:14:23 +00:00 · 11835ccf2d
commit 11835ccf2d
parent 92da3ef714
5 changed files with 39 additions and 61 deletions
--- a/VTK-7.0.0.tar.gz
+++ b/VTK-7.0.0.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78a990a15ead79cdc752e86b83cfab7dbf5b7ef51ba409db02570dbdd9ec32c3
-size 30659751
--- a/VTK-7.1.0.tar.gz
+++ b/VTK-7.1.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f3ea001204d4f714be972a810a62c0f2277fbb9d8d2f8df39562988ca37497a
+size 31171521
--- a/vtk-gcc6.patch
+++ b/vtk-gcc6.patch
@ -1,44 +0,0 @@
-diff --git a/CMake/GenerateExportHeader.cmake b/CMake/GenerateExportHeader.cmake
-index ecfae31..80244df 100644
--- a/CMake/GenerateExportHeader.cmake
-+++ b/CMake/GenerateExportHeader.cmake
-@@ -163,10 +163,10 @@ endmacro()
- macro(_test_compiler_hidden_visibility)
- 
-   if(CMAKE_COMPILER_IS_GNUCXX)
-    execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version
-+    execute_process(COMMAND ${CMAKE_C_COMPILER} --version
-       OUTPUT_VARIABLE _gcc_version_info
-       ERROR_VARIABLE _gcc_version_info)
-    string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
-+    string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
-       _gcc_version "${_gcc_version_info}")
-     # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
-     # patch level, handle this here:
-@@ -181,7 +181,7 @@ macro(_test_compiler_hidden_visibility)
-   endif()
- 
-   if(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
-    execute_process(COMMAND ${CMAKE_CXX_COMPILER} ARGS -V
-+    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -V
-       OUTPUT_VARIABLE _intel_version_info
-       ERROR_VARIABLE _intel_version_info)
-     string(REGEX REPLACE ".*Version ([0-9]+(\\.[0-9]+)+).*" "\\1"
-diff --git a/CMake/vtkCompilerExtras.cmake b/CMake/vtkCompilerExtras.cmake
-index e39bd30..4dc928a 100644
--- a/CMake/vtkCompilerExtras.cmake
-+++ b/CMake/vtkCompilerExtras.cmake
-@@ -28,11 +28,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-   endif()
- 
-   # Now check if we can use visibility to selectively export symbols
-  execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version
-+  execute_process(COMMAND ${CMAKE_C_COMPILER} --version
-     OUTPUT_VARIABLE _gcc_version_info
-     ERROR_VARIABLE _gcc_version_info)
- 
-  string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
-+  string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
-     _gcc_version "${_gcc_version_info}")
-   if(NOT _gcc_version)
-     string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"
--- a/vtk.changes
+++ b/vtk.changes
@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Nov 23 10:28:02 UTC 2016 - badshah400@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 - badshah400@gmail.com

--- a/vtk.spec
+++ b/vtk.spec
@ -17,9 +17,9 @@


 Name:           vtk
-Version:        7.0.0
+Version:        7.1.0
 Release:        0
-%define series 7.0
+%define series 7.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
@ -34,13 +34,11 @@ Source1:        vtk-rpmlintrc
 Patch1:         vtk-fix-file-contains-date-time.patch
 # PATCH-FIX-UPSTREAM vtk-Rinterface-uintptr_t.patch boo#985386 badshah400@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
-# PATCH-FIX-UPSTREAM vtk-gcc6.patch dmueller@suse.com -- Fix compilation with GCC >= 6.0
-Patch3:         vtk-gcc6.patch
 BuildRequires:  Mesa-libGL-devel
 BuildRequires:  R-base-devel
 BuildRequires:  boost-devel
 BuildRequires:  chrpath
-BuildRequires:  cmake
+BuildRequires:  cmake >= 3.4
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  freetype2-devel
@ -84,8 +82,8 @@ BuildRequires:  libxml2-devel
 %else
 BuildRequires:  pkgconfig(libxml-2.0)
 %endif
-# jsoncpp available for openSUSE > 13.2
-%if 0%{?suse_version} > 1320
+# 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
@ -113,8 +111,8 @@ Requires:       Mesa-libGL-devel
 Requires:       R-base-devel
 Requires:       gl2ps-devel
 Requires:       hdf5-devel
-# jsoncpp available for openSUSE > 13.2
-%if 0%{?suse_version} > 1320
+# jsoncpp available for openSUSE > 13.2 & Leap
+%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315
 Requires:       jsoncpp-devel
 %endif
 Requires:       freetype2-devel
@ -265,7 +263,6 @@ This package provides a few testing programs for VTK.
 %setup -q -n VTK-%{version}
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1

 # Replace relative path ../../../VTKData with %%{_datadir}/%%{name}data-%%{version}
 # otherwise it will break on symlinks.
@ -298,7 +295,7 @@ 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
+%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315
    -DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
 %else
    -DVTK_USE_SYSTEM_LIBRARIES:BOOL=OFF \
@ -323,7 +320,9 @@ cmake .. \
    -DVTK_USE_SYSTEM_HDF5:BOOL=ON  \
    -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \
    -DVTK_PYTHON_VERSION=3 \
-    -DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON
+    -DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON \
+    -DVTK_USE_SYSTEM_DIY2=OFF \
+    -DVTK_USE_SYSTEM_GL2PS=OFF

 make %{?_smp_mflags} VERBOSE=1

@ -419,22 +418,28 @@ chrpath -d %{buildroot}%{_bindir}/*
 %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
-%if 0%{?suse_version} <= 1320
+%{_bindir}/pvtk
+%if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315
 %{_bindir}/%{name}mkg3states
 %endif
 %{_datadir}/doc/%{name}-%{series}/
 %{_libdir}/%{name}/*.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
-%{_datadir}/%{name}-%{series}/

 %files java
 %defattr(-,root,root,-)