From d4c0458e43599e4767cff5a4a18b86be7bf3f1cc5d14661bbb96b18a26c36528 Mon Sep 17 00:00:00 2001 From: Detlef Steuer Date: Thu, 10 Nov 2011 11:42:23 +0000 Subject: [PATCH] Accepting request 90924 from home:badshah400:branches:science Update to version 3.12.0 -- New features and bug fixes; dropped patches no longer required; fixes build failure on openSUSE > 11.4 OBS-URL: https://build.opensuse.org/request/show/90924 OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=2 --- ParaView-3.10.0.tar.bz2 | 3 --- ParaView-3.12.0.tar.bz2 | 3 +++ paraview-demo.patch | 10 ---------- paraview-sqldatabaseschema.patch | 18 ------------------ paraview.changes | 10 ++++++++++ paraview.spec | 13 +++---------- 6 files changed, 16 insertions(+), 41 deletions(-) delete mode 100644 ParaView-3.10.0.tar.bz2 create mode 100644 ParaView-3.12.0.tar.bz2 delete mode 100644 paraview-demo.patch delete mode 100644 paraview-sqldatabaseschema.patch diff --git a/ParaView-3.10.0.tar.bz2 b/ParaView-3.10.0.tar.bz2 deleted file mode 100644 index a06b147..0000000 --- a/ParaView-3.10.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a68f998c193ac3368bc998d8c19aa87e95a3327f6ce9393d339dfd00dec69a9 -size 32474608 diff --git a/ParaView-3.12.0.tar.bz2 b/ParaView-3.12.0.tar.bz2 new file mode 100644 index 0000000..dc20610 --- /dev/null +++ b/ParaView-3.12.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a54537cbe5976d863f9106b75eeef91908bb9058f5f0626cebb4a311a6feb6cc +size 29563405 diff --git a/paraview-demo.patch b/paraview-demo.patch deleted file mode 100644 index e8142dd..0000000 --- a/paraview-demo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ParaView-3.8.0/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt.demo 2010-05-27 11:04:39.000000000 -0600 -+++ ParaView-3.8.0/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt 2010-06-02 09:45:44.105517239 -0600 -@@ -4,7 +4,3 @@ - add_executable(${exe} PointSpriteDemo.cxx) - - target_link_libraries(${exe} PointSprite_Rendering vtkIO) -- --install(TARGETS ${exe} -- RUNTIME DESTINATION ${PROJECT_BINARY_DIR} --) diff --git a/paraview-sqldatabaseschema.patch b/paraview-sqldatabaseschema.patch deleted file mode 100644 index d176b10..0000000 --- a/paraview-sqldatabaseschema.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur ParaView-3.10.0.orig//VTK/IO/vtkSQLDatabaseSchema.h ParaView-3.10.0//VTK/IO/vtkSQLDatabaseSchema.h ---- ParaView-3.10.0.orig//VTK/IO/vtkSQLDatabaseSchema.h 2011-03-10 00:01:44.000000000 +0530 -+++ ParaView-3.10.0//VTK/IO/vtkSQLDatabaseSchema.h 2011-03-30 09:31:44.544000001 +0530 -@@ -40,6 +40,14 @@ - #ifndef __vtkSQLDatabaseSchema_h - #define __vtkSQLDatabaseSchema_h - -+#ifdef TIME -+#undef TIME -+#endif -+ -+#ifdef DATE -+#undef DATE -+#endif -+ - #include "vtkObject.h" - - #include // Because one method has a variable list of arguments diff --git a/paraview.changes b/paraview.changes index ea136d3..54a7faf 100644 --- a/paraview.changes +++ b/paraview.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Nov 6 05:59:45 UTC 2011 - badshah400@gmail.com + +- Update to version 3.12.0: + + Too many changes to list. See complete list at + http://www.paraview.org/Bug/changelog_page.php?version_id=85 +- Removed paraview-demo-patch. Changes committed upstream. +- Removed paraview-sqldatabaseschema.patch. Build failure + properly taken care of upstream. + ------------------------------------------------------------------- Sun Apr 3 12:25:39 UTC 2011 - badshah400@gmail.com diff --git a/paraview.spec b/paraview.spec index 6e3c6af..83b1767 100644 --- a/paraview.spec +++ b/paraview.spec @@ -1,7 +1,7 @@ # # spec file for package # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: paraview -Version: 3.10.0 +Version: 3.12.0 Release: 1 License: BSD Summary: Data analysis and visualization application Url: http://www.paraview.org Group: Productivity/Scientific/Physics Source0: ParaView-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM paraview-sqldatabaseschema.patch badshah400@gmail.com --Patch to fix compilation problems with python enabled (patch came from upstream) -Patch0: paraview-sqldatabaseschema.patch -# PATCH-FIX-UPSTREAM paraview-demo.patch badshah400@gmail.com --Patch for PointSprite demo -Patch1: paraview-demo.patch # PATCH-FIX-UPSTREAM paraview-default-qtstyle.patch badshah400@gmail.com --Make paraview inherit default qt gui look and feel, instead of using the Plastique theme Patch2: paraview-default-qtstyle.patch BuildRequires: Mesa-devel @@ -78,8 +73,6 @@ NOTE: The version in this package has NOT been compiled with MPI support. %prep %setup -q -n ParaView-%{version} -%patch0 -p1 -%patch1 -p1 %patch2 -p1 %build @@ -140,7 +133,7 @@ pushd temp_dir %makeinstall popd rm -rf temp_dir/ -rm -rf /usr/src/packages/BUILD/ParaView-3.10.0/temp_dir/Plugins/PointSprite/PointSpriteDemo +rm -rf /usr/src/packages/BUILD/ParaView-%{version}/temp_dir/Plugins/PointSprite/PointSpriteDemo %clean %{?buildroot:%__rm -rf %{buildroot}}