From 0074f53c52eb931932c347c528eb05c83c3c6cf3892b4c7097acb478be909631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 27 Oct 2012 18:19:25 +0000 Subject: [PATCH] Accepting request 139569 from home:badshah400:branches:science Update to version 5.10.1 OBS-URL: https://build.opensuse.org/request/show/139569 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=40 --- vtk-5.10.0.tar.gz | 3 --- vtk-5.10.1.tar.gz | 3 +++ vtk-fix-file-contains-date-time.patch | 13 +++++++++++++ vtk-soversion2.patch | 8 ++++---- vtk.changes | 17 +++++++++++++++++ vtk.spec | 7 +++++-- 6 files changed, 42 insertions(+), 9 deletions(-) delete mode 100644 vtk-5.10.0.tar.gz create mode 100644 vtk-5.10.1.tar.gz create mode 100644 vtk-fix-file-contains-date-time.patch diff --git a/vtk-5.10.0.tar.gz b/vtk-5.10.0.tar.gz deleted file mode 100644 index 76aef5b..0000000 --- a/vtk-5.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9dd8c750f5d974ca92734d0168db6b534109b9ec30461eb7082a9f71d4716392 -size 24803686 diff --git a/vtk-5.10.1.tar.gz b/vtk-5.10.1.tar.gz new file mode 100644 index 0000000..bd04b08 --- /dev/null +++ b/vtk-5.10.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1a240c1f5f0d84e27b57e962f8e4a78b166b25bf4003ae16def9874947ebdbb +size 24804193 diff --git a/vtk-fix-file-contains-date-time.patch b/vtk-fix-file-contains-date-time.patch new file mode 100644 index 0000000..9d30cae --- /dev/null +++ b/vtk-fix-file-contains-date-time.patch @@ -0,0 +1,13 @@ +Index: VTK5.10.1/Utilities/vtknetcdf/libdispatch/error.c +=================================================================== +--- VTK5.10.1.orig/Utilities/vtknetcdf/libdispatch/error.c ++++ VTK5.10.1/Utilities/vtknetcdf/libdispatch/error.c +@@ -9,7 +9,7 @@ + #include "ncdispatch.h" + + /* Tell the user the version of netCDF. */ +-static const char nc_libvers[] = PACKAGE_VERSION " of "__DATE__" "__TIME__" $"; ++static const char nc_libvers[] = PACKAGE_VERSION; + + const char * + nc_inq_libvers(void) diff --git a/vtk-soversion2.patch b/vtk-soversion2.patch index 6e4d85f..536ed31 100644 --- a/vtk-soversion2.patch +++ b/vtk-soversion2.patch @@ -1,8 +1,8 @@ -Index: VTK/Utilities/vtknetcdf/CMakeLists.txt +Index: VTK5.10.1/Utilities/vtknetcdf/CMakeLists.txt =================================================================== ---- VTK.orig/Utilities/vtknetcdf/CMakeLists.txt -+++ VTK/Utilities/vtknetcdf/CMakeLists.txt -@@ -350,6 +350,7 @@ TARGET_LINK_LIBRARIES(vtkNetCDF_cxx vtkN +--- VTK5.10.1.orig/Utilities/vtknetcdf/CMakeLists.txt ++++ VTK5.10.1/Utilities/vtknetcdf/CMakeLists.txt +@@ -348,6 +348,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}) diff --git a/vtk.changes b/vtk.changes index dcb573d..14c5487 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Oct 26 14:04:41 UTC 2012 - badshah400@gmail.com + +- Update to version 5.10.1: + + Fix netCDF symbol mangling, which allows applications to use + an external netCDF library and VTK's internal copy + simultaneously + + Fixes for STL and SLC readers that prevent crashes and file + handle resource exhaustion + + Fix compilation on FreeBSD operating system + + A handful of fixes in VTK's Qt interface kit + + Fixes for interpreted language wrapping including a bug which + prevented java wrapping of VTK on power PC macs, and + compatibility with Tcl 8.6 +- Add vtk-fix-file-contains-date-time.patch to fix rpmlint + warning about a packaged file containing DATE and TIME. + ------------------------------------------------------------------- Mon Jun 25 20:46:30 UTC 2012 - scorot@free.fr diff --git a/vtk.spec b/vtk.spec index 190e7ec..f272192 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Name: vtk -Version: 5.10.0 +Version: 5.10.1 Release: 0 %define series 5.10 # This is a variant BSD license, a cross between BSD and ZLIB. @@ -36,6 +36,8 @@ Patch1: vtk-system.patch Patch2: vtk-soversion2.patch # PATCH-FIX-UPSTREAM vtk-sqldatabaseschema.patch badshah400@gmail.com -- Fix problems with vtkSQLDatabaseSchema.h Patch3: vtk-sqldatabaseschema.patch +# PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch badshah400@gmail.com -- Fix file containing DATE and TIME +Patch4: vtk-fix-file-contains-date-time.patch %if 0%{?suse_version} > 1210 BuildRequires: Mesa-libGL-devel %else @@ -246,13 +248,14 @@ volume rendering, LOD control). This package provides a few testing programs for VTK. %prep -%setup -q -n VTK +%setup -q -n VTK%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 %if 0%{?suse_version} == 1140 %patch3 -p1 %endif +%patch4 -p1 # 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')