Accepting request 121530 from home:badshah400:branches:science

Update to version 5.10.0 (now builds on openSUSE 11.4 as well);

OBS-URL: https://build.opensuse.org/request/show/121530
OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=35

vtk-5.10.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9dd8c750f5d974ca92734d0168db6b534109b9ec30461eb7082a9f71d4716392
+size 24803686

vtk-5.8.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83ee74b83403590342c079a52b06eef7ab862417f941d5f4558aea25c6bbc2d5
-size 23745803

vtk-boost149.patch

@@ -1,39 +0,0 @@
-Index: VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-===================================================================
---- VTK.orig/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-+++ VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-@@ -47,6 +47,21 @@ using namespace boost;
- vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
- 
- 
-+#if BOOST_VERSION >= 104800      // Boost 1.48.x
-+namespace {
-+  vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
-+    return e.Id;
-+  }
-+  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
-+# if BOOST_VERSION == 104800
-+    return e.underlying_desc.Id;
-+# else
-+    return e.underlying_descx.Id;
-+#endif
-+  }
-+}
-+#endif
-+
- // Redefine the bfs visitor, the only visitor we
- // are using is the tree_edge visitor.
- template <typename IdMap>
-@@ -95,7 +110,12 @@ public:
- 
-     // Copy the vertex and edge data from the graph to the tree.
-     tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v);
-+#if BOOST_VERSION < 104800      // Boost 1.48.x
-     tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id);
-+#else
-+    tree->GetEdgeData()->CopyData(graph->GetEdgeData(),
-+                                  unwrap_edge_id(e), tree_e.Id);
-+#endif
-   }
- 
- private:

vtk-pythondestdir.patch

@@ -2,7 +2,7 @@ Index: VTK/Wrapping/Python/CMakeLists.txt
 ===================================================================
 --- VTK.orig/Wrapping/Python/CMakeLists.txt
 +++ VTK/Wrapping/Python/CMakeLists.txt
-@@ -540,7 +540,7 @@ IF(PYTHON_EXECUTABLE)
+@@ -558,7 +558,7 @@ IF(PYTHON_EXECUTABLE)
  
      # Create default python setup arguments if they are not set.
      IF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)

vtk-soversion2.patch

@@ -1,10 +1,12 @@
---- VTK/Utilities/vtknetcdf/CMakeLists.txt.old	2011-05-27 18:33:10.035001264 +0100
+Index: VTK/Utilities/vtknetcdf/CMakeLists.txt
-+++ VTK/Utilities/vtknetcdf/CMakeLists.txt	2011-05-27 18:34:16.298001142 +0100
+===================================================================
-@@ -298,6 +298,7 @@ ADD_DEFINITIONS("-DNC_DLL_EXPORT")
+--- VTK.orig/Utilities/vtknetcdf/CMakeLists.txt
++++ VTK/Utilities/vtknetcdf/CMakeLists.txt
+@@ -350,6 +350,7 @@ TARGET_LINK_LIBRARIES(vtkNetCDF_cxx vtkN
  # Apply user-defined properties to the library target.
  IF(VTK_LIBRARY_PROPERTIES)
    SET_TARGET_PROPERTIES(vtkNetCDF PROPERTIES ${VTK_LIBRARY_PROPERTIES})
 +  SET_TARGET_PROPERTIES(vtkNetCDF_cxx PROPERTIES ${VTK_LIBRARY_PROPERTIES})
  ENDIF(VTK_LIBRARY_PROPERTIES)
  
- IF(NOT VTK_INSTALL_NO_LIBRARIES)
+ #-----------------------------------------------------------------------------

vtk-system.patch

@@ -2,7 +2,7 @@ Index: VTK/CMakeLists.txt
 ===================================================================
 --- VTK.orig/CMakeLists.txt
 +++ VTK/CMakeLists.txt
-@@ -126,6 +126,11 @@ IF(CMAKE_CONFIGURATION_TYPES)
+@@ -132,6 +132,11 @@ IF(CMAKE_CONFIGURATION_TYPES)
  ENDIF(CMAKE_CONFIGURATION_TYPES)
  
  #-----------------------------------------------------------------------------
@@ -30,7 +30,7 @@ Index: VTK/Rendering/CMakeLists.txt
 ===================================================================
 --- VTK.orig/Rendering/CMakeLists.txt
 +++ VTK/Rendering/CMakeLists.txt
-@@ -207,7 +207,8 @@ ENDIF (NOT VTK_LEGACY_REMOVE)
+@@ -217,7 +217,8 @@ ENDIF (NOT VTK_LEGACY_REMOVE)
  
  IF(VTK_USE_GL2PS)
    SET(Kit_SRCS ${Kit_SRCS} vtkGL2PSExporter.cxx)

vtk.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri May 18 21:20:14 UTC 2012 - badshah400@gmail.com
+
+- Update to version 5.10.0: See
+  http://www.kitware.com/news/home/browse/408
+  for a detailed list of changes
+- Dropped patches:
+  + vtk-boost149.patch: implemented upstream
+- Patch vtk-sqldatabaseschema.patch now only required for
+  openSUSE 11.4
+- Minor rebasing of existing patches so they apply cleanly
+- No longer use verbose make.
+
 -------------------------------------------------------------------
 Thu May 10 11:32:21 UTC 2012 - idonmez@suse.com
 

vtk.spec

@@ -17,8 +17,9 @@
 
 
 Name:           vtk
-Version:        5.8.0
+Version:        5.10.0
 Release:        0
+%define series 5.10
 # 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
@@ -26,17 +27,15 @@ Summary:        The Visualization Toolkit - A high level 3D visualization librar
 License:        BSD-3-Clause
 Group:          Productivity/Scientific/Other
 Url:            http://vtk.org/
-Source:         http://www.vtk.org/files/release/5.8/%{name}-%{version}.tar.gz
+Source:         http://www.vtk.org/files/release/%{series}/%{name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM vtk-pythondestdir.patch badshah400@gmail.com -- Correct installation destination for python libraries
 Patch0:         vtk-pythondestdir.patch
 # PATCH-FIX-UPSTREAM vtk-system.patch badshah400@gmail.com -- Use system libraries, http://public.kitware.com/Bug/view.php?id=11823
 Patch1:         vtk-system.patch
-# PATCH-FIX-UPSTREAM vtk-sqldatabaseschema.patch badshah400@gmail.com -- Resolve problems with vtkSQLdatabaseschema.cxx, patch came from upstream
-Patch2:         vtk-sqldatabaseschema.patch
 # patch to fix the soname for libVTKnetcdf_cxx
-Patch3:         vtk-soversion2.patch
+Patch2:         vtk-soversion2.patch
-# PATCH-FIX-UPSTREAM vtk-boost149.patch idoenmez@suse.de -- Fix compilation with boost 1.49
+# PATCH-FIX-UPSTREAM vtk-sqldatabaseschema.patch badshah400@gmail.com -- Fix problems with vtkSQLDatabaseSchema.h
-Patch4:         vtk-boost149.patch
+Patch3:         vtk-sqldatabaseschema.patch
 %if 0%{?suse_version} > 1210
 BuildRequires:  Mesa-libGL-devel
 %else
@@ -239,14 +238,15 @@ This package provides a few testing programs for VTK.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%if 0%{?suse_version} == 1140
 %patch3 -p1
-%patch4 -p1
+%endif
 
 # Remove build time references so build-compare can do its work
-FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
+#FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
-FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
+#FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
-sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" Utilities/vtknetcdf/libvers.c
+#sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" Utilities/vtknetcdf/libvers.c
-sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" Utilities/vtknetcdf/libvers.c
+#sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" Utilities/vtknetcdf/libvers.c
 
 # Replace relative path ../../../VTKData with %%{_datadir}/%%{name}data-%%{version}
 # otherwise it will break on symlinks.
@@ -293,7 +293,7 @@ cmake .. \
 # Package fails to compile with the following option (Note: postgresql-devel and libpqxx-devel are needed as dependencies)
 #    -DVTK_USE_POSTGRES:BOOL=ON \
 
-make %{?_smp_mflags} VERBOSE=1
+make %{?_smp_mflags}
 
 # 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
@@ -439,7 +439,7 @@ mv %{buildroot}%{_libdir}/%{name}/*.tcl %{buildroot}%{_datadir}/tcl/%{name}/
 %{_libdir}/%{name}/doxygen/
 %{_libdir}/%{name}/CMake/
 %{_libdir}/%{name}/hints/
-%{_includedir}/%{name}-5.8/
+%{_includedir}/%{name}-%{series}/
 
 %files java
 %defattr(-,root,root,-)