diff --git a/vtk-5.6.1.tar.bz2 b/vtk-5.6.1.tar.bz2 deleted file mode 100644 index 4f95ebb..0000000 --- a/vtk-5.6.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b7aa8add0ada3f1a89cc791b8ddf3881964a30fecb55bb35857845d01e32b5e -size 16947526 diff --git a/vtk-5.8.0.tar.gz b/vtk-5.8.0.tar.gz new file mode 100644 index 0000000..a9a8130 --- /dev/null +++ b/vtk-5.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83ee74b83403590342c079a52b06eef7ab862417f941d5f4558aea25c6bbc2d5 +size 23745803 diff --git a/vtk-Balloon-Representation.patch b/vtk-Balloon-Representation.patch deleted file mode 100644 index a4ca025..0000000 --- a/vtk-Balloon-Representation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur VTK//Widgets/vtkBalloonRepresentation.cxx VTK.new//Widgets/vtkBalloonRepresentation.cxx ---- VTK//Widgets/vtkBalloonRepresentation.cxx 2010-09-28 02:10:11.000000000 +0530 -+++ VTK.new//Widgets/vtkBalloonRepresentation.cxx 2011-04-14 05:15:50.706000023 +0530 -@@ -215,7 +215,7 @@ - int size[2]; - size[0] = (this->Renderer->GetSize())[0]; - size[1] = (this->Renderer->GetSize())[1]; -- int stringSize[2]; stringSize[0] = stringSize[0] = 0; -+ int stringSize[2]; stringSize[0] = stringSize[1] = 0; - double imageSize[2]; imageSize[0] = imageSize[1] = 0.0; - double frameSize[2]; frameSize[0] = frameSize[1] = 0.0; - double io[2], so[2], fo[2]; diff --git a/vtk-gcc43.patch b/vtk-gcc43.patch deleted file mode 100644 index 5dd1c07..0000000 --- a/vtk-gcc43.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- VTK/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43 2008-03-19 21:22:17.000000000 +0100 -+++ VTK/Utilities/DICOMParser/DICOMAppHelper.cxx 2008-10-05 11:46:08.000000000 +0200 -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #if defined(__BORLANDC__) ---- VTK/Utilities/DICOMParser/DICOMFile.cxx.gcc43 2008-03-19 21:22:17.000000000 +0100 -+++ VTK/Utilities/DICOMParser/DICOMFile.cxx 2008-10-05 11:46:02.000000000 +0200 -@@ -27,7 +27,7 @@ - - #include - #include --#include -+#include - - DICOMFile::DICOMFile() : InputStream() - { ---- VTK/Utilities/DICOMParser/DICOMParser.cxx.gcc43 2008-07-21 19:03:03.000000000 +0200 -+++ VTK/Utilities/DICOMParser/DICOMParser.cxx 2008-10-05 11:45:56.000000000 +0200 -@@ -40,7 +40,7 @@ - #endif - - #include --#include -+#include - - // Define DEBUG_DICOM to get debug messages sent to dicom_stream::cerr - // #define DEBUG_DICOM - diff --git a/vtk-gcc46.patch b/vtk-gcc46.patch deleted file mode 100644 index 431e800..0000000 --- a/vtk-gcc46.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up VTK/Common/vtkPythonUtil.cxx.gcc46 VTK/Common/vtkPythonUtil.cxx ---- VTK/Common/vtkPythonUtil.cxx.gcc46 2010-09-27 14:40:01.000000000 -0600 -+++ VTK/Common/vtkPythonUtil.cxx 2011-02-08 11:15:39.596308982 -0700 -@@ -31,6 +31,8 @@ - #include - #include - -+#include -+ - // Silent warning like - // "dereferencing type-punned pointer will break strict-aliasing rules" - // it happens because this kind of expression: (long *)&ptr -diff -up VTK/Utilities/vtkmetaio/metaUtils.cxx.gcc46 VTK/Utilities/vtkmetaio/metaUtils.cxx ---- VTK/Utilities/vtkmetaio/metaUtils.cxx.gcc46 2010-09-27 14:40:10.000000000 -0600 -+++ VTK/Utilities/vtkmetaio/metaUtils.cxx 2011-02-08 10:43:25.265499011 -0700 -@@ -34,6 +34,7 @@ - #include - #endif - -+#include - #include - #include - #include - diff --git a/vtk-libpng14.patch b/vtk-libpng14.patch deleted file mode 100644 index f69bd98..0000000 --- a/vtk-libpng14.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur VTK//IO/vtkPNGReader.cxx VTK.new//IO/vtkPNGReader.cxx ---- VTK//IO/vtkPNGReader.cxx 2010-09-28 02:10:05.000000000 +0530 -+++ VTK.new//IO/vtkPNGReader.cxx 2011-03-24 00:28:48.102001081 +0530 -@@ -115,7 +115,7 @@ - // minimum of a byte per pixel - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - // add alpha if any alpha found -@@ -224,7 +224,7 @@ - // minimum of a byte per pixel - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - // add alpha if any alpha found diff --git a/vtk-python27-compat.patch b/vtk-python27-compat.patch deleted file mode 100644 index 81ffd2d..0000000 --- a/vtk-python27-compat.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMake/FindPythonLibs.cmake b/CMake/FindPythonLibs.cmake -index 1ba21b5..217e7e9 100644 ---- a/CMake/FindPythonLibs.cmake -+++ b/CMake/FindPythonLibs.cmake -@@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks) - # Search for the python framework on Apple. - CMAKE_FIND_FRAMEWORKS(Python) - --FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) -+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - IF(WIN32) - FIND_LIBRARY(PYTHON_DEBUG_LIBRARY - diff --git a/vtk-pythondestdir.patch b/vtk-pythondestdir.patch index 27797dc..39ac865 100644 --- a/vtk-pythondestdir.patch +++ b/vtk-pythondestdir.patch @@ -1,8 +1,9 @@ -diff -ur VTK//Wrapping/Python/CMakeLists.txt VTK.new//Wrapping/Python/CMakeLists.txt ---- VTK//Wrapping/Python/CMakeLists.txt 2010-09-28 02:10:11.000000000 +0530 -+++ VTK.new//Wrapping/Python/CMakeLists.txt 2011-03-23 23:01:48.995000067 +0530 -@@ -417,7 +417,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) + # Create default python setup arguments if they are not set. IF(NOT DEFINED VTK_PYTHON_SETUP_ARGS) - SET(VTK_PYTHON_SETUP_ARGS "--prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\"" diff --git a/vtk-soversion.patch b/vtk-soversion.patch deleted file mode 100644 index 88896d6..0000000 --- a/vtk-soversion.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up VTK/Utilities/Cosmo/CMakeLists.txt.soversion VTK/Utilities/Cosmo/CMakeLists.txt ---- VTK/Utilities/Cosmo/CMakeLists.txt.soversion 2010-09-27 14:40:07.000000000 -0600 -+++ VTK/Utilities/Cosmo/CMakeLists.txt 2011-02-18 09:23:40.749509891 -0700 -@@ -35,6 +35,11 @@ INCLUDE_DIRECTORIES (${Cosmo_SOURCE_DIR} - ADD_LIBRARY(Cosmo ${Cosmo_SOURCES}) - TARGET_LINK_LIBRARIES(Cosmo vtksys vtkCommon ${Cosmo_LIBS}) - -+# Apply user-defined properties to the library target. Such as SO Version -+IF(VTK_LIBRARY_PROPERTIES) -+ SET_TARGET_PROPERTIES(Cosmo PROPERTIES ${VTK_LIBRARY_PROPERTIES}) -+ENDIF(VTK_LIBRARY_PROPERTIES) -+ - IF(NOT VTK_INSTALL_NO_LIBRARIES) - INSTALL(TARGETS Cosmo - RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries -diff -up VTK/Utilities/VPIC/CMakeLists.txt.soversion VTK/Utilities/VPIC/CMakeLists.txt ---- VTK/Utilities/VPIC/CMakeLists.txt.soversion 2010-09-27 14:40:08.000000000 -0600 -+++ VTK/Utilities/VPIC/CMakeLists.txt 2011-02-18 09:24:46.991211358 -0700 -@@ -31,6 +31,11 @@ TARGET_LINK_LIBRARIES(VPIC ${MPI_LIBRARY - ENDIF(MPI_EXTRA_LIBRARY) - ENDIF(VTK_USE_MPI) - -+# Apply user-defined properties to the library target. Such as SO Version -+IF(VTK_LIBRARY_PROPERTIES) -+ SET_TARGET_PROPERTIES(VPIC PROPERTIES ${VTK_LIBRARY_PROPERTIES}) -+ENDIF(VTK_LIBRARY_PROPERTIES) -+ - IF(NOT VTK_INSTALL_NO_LIBRARIES) - INSTALL(TARGETS VPIC - RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries - diff --git a/vtk-sqldatabaseschema.patch b/vtk-sqldatabaseschema.patch index 947d772..5628402 100644 --- a/vtk-sqldatabaseschema.patch +++ b/vtk-sqldatabaseschema.patch @@ -1,7 +1,8 @@ -diff -ur VTK.orig//IO/vtkSQLDatabaseSchema.h VTK//IO/vtkSQLDatabaseSchema.h ---- VTK.orig//IO/vtkSQLDatabaseSchema.h 2010-09-28 02:10:05.000000000 +0530 -+++ VTK//IO/vtkSQLDatabaseSchema.h 2011-03-30 09:10:08.513000002 +0530 -@@ -32,6 +32,14 @@ +Index: VTK/IO/vtkSQLDatabaseSchema.h +=================================================================== +--- VTK.orig/IO/vtkSQLDatabaseSchema.h ++++ VTK/IO/vtkSQLDatabaseSchema.h +@@ -40,6 +40,14 @@ PURPOSE. See the above copyright notice #ifndef __vtkSQLDatabaseSchema_h #define __vtkSQLDatabaseSchema_h @@ -15,4 +16,4 @@ diff -ur VTK.orig//IO/vtkSQLDatabaseSchema.h VTK//IO/vtkSQLDatabaseSchema.h + #include "vtkObject.h" - #include // Because one method has a variable list of arguments + #include // Because one method has a variable list of arguments diff --git a/vtk-string-length.patch b/vtk-string-length.patch deleted file mode 100644 index 9911546..0000000 --- a/vtk-string-length.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- VTK//Utilities/kwsys/SystemInformation.cxx 2010-09-28 02:10:08.000000000 +0530 -+++ VTK.new//Utilities/kwsys/SystemInformation.cxx 2011-04-14 04:54:06.350000017 +0530 -@@ -152,7 +152,7 @@ - - public: - #define VENDOR_STRING_LENGTH (12 + 1) --#define CHIPNAME_STRING_LENGTH (48 + 1) -+#define CHIPNAME_STRING_LENGTH (64 + 1) - #define SERIALNUMBER_STRING_LENGTH (29 + 1) - - typedef struct tagID - diff --git a/vtk-system.patch b/vtk-system.patch index b20d187..dda5454 100644 --- a/vtk-system.patch +++ b/vtk-system.patch @@ -1,7 +1,8 @@ -diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt ---- VTK/CMakeLists.txt.system 2010-09-27 14:40:00.000000000 -0600 -+++ VTK/CMakeLists.txt 2011-02-08 14:08:29.367122550 -0700 -@@ -106,6 +106,11 @@ IF(CMAKE_CONFIGURATION_TYPES) +Index: VTK/CMakeLists.txt +=================================================================== +--- VTK.orig/CMakeLists.txt ++++ VTK/CMakeLists.txt +@@ -126,6 +126,11 @@ IF(CMAKE_CONFIGURATION_TYPES) ENDIF(CMAKE_CONFIGURATION_TYPES) #----------------------------------------------------------------------------- @@ -13,9 +14,10 @@ diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt # Load some macros. INCLUDE(vtkDependentOption) INCLUDE(vtkThirdParty) -diff -up VTK/CMake/vtkThirdParty.cmake.system VTK/CMake/vtkThirdParty.cmake ---- VTK/CMake/vtkThirdParty.cmake.system 2010-09-27 14:40:00.000000000 -0600 -+++ VTK/CMake/vtkThirdParty.cmake 2011-02-08 14:07:46.424662568 -0700 +Index: VTK/CMake/vtkThirdParty.cmake +=================================================================== +--- VTK.orig/CMake/vtkThirdParty.cmake ++++ VTK/CMake/vtkThirdParty.cmake @@ -1,6 +1,6 @@ #----------------------------------------------------------------------------- MACRO(VTK_THIRD_PARTY_OPTION upper lower) @@ -24,17 +26,17 @@ diff -up VTK/CMake/vtkThirdParty.cmake.system VTK/CMake/vtkThirdParty.cmake MARK_AS_ADVANCED(VTK_USE_SYSTEM_${upper}) IF(VTK_USE_SYSTEM_${upper}) IF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake) -diff -up VTK/Rendering/CMakeLists.txt.system VTK/Rendering/CMakeLists.txt ---- VTK/Rendering/CMakeLists.txt.system 2010-09-27 14:40:06.000000000 -0600 -+++ VTK/Rendering/CMakeLists.txt 2011-02-08 14:11:47.379633170 -0700 -@@ -202,7 +202,8 @@ ENDIF (NOT VTK_LEGACY_REMOVE) +Index: VTK/Rendering/CMakeLists.txt +=================================================================== +--- VTK.orig/Rendering/CMakeLists.txt ++++ VTK/Rendering/CMakeLists.txt +@@ -207,7 +207,8 @@ ENDIF (NOT VTK_LEGACY_REMOVE) IF(VTK_USE_GL2PS) SET(Kit_SRCS ${Kit_SRCS} vtkGL2PSExporter.cxx) -- +- + OPTION(VTK_USE_SYSTEM_GL2PS "Use the system's gl2ps library." ${VTK_USE_SYSTEM_LIBRARIES}) + MARK_AS_ADVANCED(VTK_USE_SYSTEM_GL2PS) IF(VTK_USE_SYSTEM_GL2PS) ELSE(VTK_USE_SYSTEM_GL2PS) SET(Kit_GL2PS_SRCS ${VTK_SOURCE_DIR}/Utilities/vtkgl2ps/gl2ps.c) - diff --git a/vtk-testcxxjavaremove.patch b/vtk-testcxxjavaremove.patch deleted file mode 100644 index 9009184..0000000 --- a/vtk-testcxxjavaremove.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- VTK/Graphics/Testing/Cxx/CMakeLists.txt.testcxxjava 2010-03-31 18:44:26.000000000 +0200 -+++ VTK/Graphics/Testing/Cxx/CMakeLists.txt 2010-07-10 11:29:39.943549435 +0200 -@@ -107,17 +107,3 @@ - ENDFOREACH (test) - ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY) - --IF (VTK_WRAP_JAVA) -- ADD_EXECUTABLE(TestJavaProgrammableFilter TestJavaProgrammableFilter.cxx) -- ADD_TEST(TestJavaProgrammableFilter -- ${CXX_TEST_PATH}/TestJavaProgrammableFilter -- -j ${LIBRARY_OUTPUT_PATH}/vtk.jar -- -cp ${LIBRARY_OUTPUT_PATH}/vtk.jar -- -class vtk/SampleAlgorithm -- ) -- TARGET_LINK_LIBRARIES(TestJavaProgrammableFilter -- vtkGraphicsJava -- ${JAVA_AWT_LIBRARY} -- ${JAVA_JVM_LIBRARY} -- ) --ENDIF (VTK_WRAP_JAVA) diff --git a/vtk.changes b/vtk.changes index 913a491..8e87dc9 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,15 +1,29 @@ +------------------------------------------------------------------- +Wed Oct 12 22:12:40 UTC 2011 - prusnak@opensuse.org + +- updated to 5.8.0 +- removed patches: +* vtk-Balloon-Representation.patch (applied in upstream) +* vtk-gcc43.patch (applied in upstream) +* vtk-gcc46.patch (applied in upstream) +* vtk-libpng14.patch (applied in upstream) +* vtk-python27-compat.patch (applied in upstream) +* vtk-soversion.patch (applied in upstream) +* vtk-string-length.patch (not needed anymore) +* vtk-testcxxjavaremove.patch (applied in upstream) + ------------------------------------------------------------------- Sat May 28 17:35:51 UTC 2011 - badshah400@gmail.com - Add explicit libQtWebKit-devel BuildRequires to fix build - failures on openSUSE 11.3 +failures on openSUSE 11.3 - Make description of sub-package vtk-qt more detailed - Spec file clean up ------------------------------------------------------------------- Sat May 28 07:49:50 UTC 2011 - alinm.elena@gmail.com -- fix the missing soname for libVTKnetcdf_cxx +- fix the missing soname for libVTKnetcdf_cxx ------------------------------------------------------------------- Sun May 22 17:02:27 UTC 2011 - stecue@gmail.com @@ -26,32 +40,30 @@ Thu Apr 14 19:59:13 UTC 2011 - badshah400@gmail.com Thu Apr 14 16:54:15 UTC 2011 - badshah400@gmail.com - Restored vtk-string-length.patch to solve buffer overflow errors - during string copy operations +during string copy operations ------------------------------------------------------------------- Wed Mar 30 03:42:15 UTC 2011 - badshah400@gmail.com - Added vtk-sqldatabaseschema.patch (from upstream) to fix - compilation errors with python enabled +compilation errors with python enabled ------------------------------------------------------------------- Wed Mar 23 18:21:30 UTC 2011 - badshah400@gmail.com - Update to version 5.6.1, rebase existing patches and remove - unnecessary ones +unnecessary ones ------------------------------------------------------------------- Wed Mar 23 11:01:06 UTC 2011 - badshah400@gmail.com - Add vtk-python2.7-compat.patch to fix build problems with - python 2.7 +python 2.7 - Add vtk-gcc4.3.patch to fix building issues with gcc 4.3 ------------------------------------------------------------------ Thu Mar 25 11:50:35 CET 2010 - boris@steki.net - Extended buffer size in VTK/Utilities/kwsys/SystemInformation.cxx - to fix buffer overflow report from rpmlint - - +to fix buffer overflow report from rpmlint diff --git a/vtk.spec b/vtk.spec index 1f53a52..569f1ba 100644 --- a/vtk.spec +++ b/vtk.spec @@ -1,5 +1,5 @@ # -# spec file for package +# spec file for package vtk # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,44 +19,25 @@ %define qtdir /%{_lib}/qt4 Name: vtk -Version: 5.6.1 +Version: 5.8.0 Release: 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 License: BSD Summary: The Visualization Toolkit - A high level 3D visualization library +Url: http://vtk.org/ Group: Productivity/Scientific/Other -Source: %{name}-%{version}.tar.bz2 +Source: http://www.vtk.org/files/release/5.8/%{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-gcc43.patch --badshah400@gmail.com Compatibility with gcc 4.3 and above -Patch1: vtk-gcc43.patch -# PATCH-FIX-UPSTREAM vtk-testcxxjavaremove.patch --badshah400@gmail.com -Patch2: vtk-testcxxjavaremove.patch -# PATCH-FIX-UPSTREAM vtk-python27-compat.patch --badshah400@gmail.com Python 2.7 compatibility -Patch3: vtk-python27-compat.patch -# PATCH-FIX-UPSTREAM vtk-gcc46.patch --badshah400@gmail.com Add needed includes for gcc 4.6 -# http://public.kitware.com/Bug/view.php?id=11824 -Patch4: vtk-gcc46.patch # PATCH-FIX-UPSTREAM vtk-system.patch --badshah400@gmail.com Use system libraries # http://public.kitware.com/Bug/view.php?id=11823 -Patch5: vtk-system.patch -# PATCH-FIX-UPSTREAM vtk-soversion.patch --badshah400@gmail.com Upstream patch to add soversions to libCosmo and libVPIC -Patch6: vtk-soversion.patch +Patch1: vtk-system.patch # PATCH-FIX-UPSTREAM vtk-sqldatabaseschema.patch --badshah400@gmail.com Resolve problems with vtkSQLdatabaseschema.cxx, patch came from upstream -Patch7: vtk-sqldatabaseschema.patch -%if 0%{?suse_version} > 1120 -# PATCH-FIX-UPSTREAM vtk-libpng14.patch --badshah400@gmail.com Restore compatibility with libpng14 -Patch8: vtk-libpng14.patch -%endif -# PATCH-FIX-UPSTREAM vtk-string-length.patch badshah400@gmail.com Prevent buffer overflows during string copy -Patch9: vtk-string-length.patch -# PATCH-FIX-UPSTREAM vtk-Balloon-Representation.patch badshah400@gmail.com Correct assignment operations in source files -Patch10: vtk-Balloon-Representation.patch +Patch2: vtk-sqldatabaseschema.patch # patch to fix the soname for libVTKnetcdf_cxx -Patch11: vtk-soversion2.patch -Url: http://vtk.org/ +Patch3: vtk-soversion2.patch BuildRequires: Mesa-devel BuildRequires: MesaGLw-devel BuildRequires: boost-devel @@ -71,26 +52,24 @@ BuildRequires: gcc-java BuildRequires: gnuplot BuildRequires: graphviz BuildRequires: java-devel +BuildRequires: libQtWebKit-devel BuildRequires: libexpat-devel BuildRequires: libgcj-devel BuildRequires: libjpeg-devel BuildRequires: libmysqlclient-devel BuildRequires: libpng-devel BuildRequires: libqt4-devel -BuildRequires: libQtWebKit-devel BuildRequires: libtheora-devel BuildRequires: libtiff-devel -BuildRequires: libxml2-devel -BuildRequires: make BuildRequires: openmotif-devel BuildRequires: postgresql-devel BuildRequires: python-devel BuildRequires: sqlite3-devel BuildRequires: tcl-devel BuildRequires: tk-devel -BuildRequires: wget BuildRequires: xorg-x11-devel BuildRequires: zlib-devel +BuildRequires: pkgconfig(libxml-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -103,6 +82,7 @@ volume rendering, LOD control). %package devel Summary: VTK header files for building C++ code Group: Development/Libraries/Other +Requires: %{name} = %{version} Requires: Mesa-devel Requires: libexpat-devel Requires: libjpeg-devel @@ -113,7 +93,6 @@ Requires: libqt4-devel Requires: libtheora-devel Requires: libtiff-devel Requires: postgresql-devel -Requires: %{name} = %{version} %description devel VTK is an open-source software system for image processing, 3D @@ -185,8 +164,8 @@ This package provides a few testing programs for VTK %package qt Summary: QT VTK widget -Requires: %{name} = %{version} Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} %description qt VTK is an open-source software system for image processing, 3D @@ -197,7 +176,6 @@ volume rendering, LOD control). This package provides Qt bindings for VTK. - %package examples Summary: Examples for VTK Group: Productivity/Scientific/Other @@ -221,28 +199,10 @@ programming languages. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%if 0%{?suse_version} > 1120 -%patch8 -p1 -%endif -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} # otherwise it will break on symlinks. -grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \ - perl -pi -e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/%{name},g' - -# Save an unbuilt copy of the Example's sources for %doc -#mkdir vtk-examples-5.6 -#cp -a Examples vtk-examples-5.6 -# Don't ship Win32 examples -rm -rf vtk-examples-5.6/Examples/GUI/Win32 -#find vtk-examples-5.6 -type f | xargs chmod -R a-x +grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs perl -pi -e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/%{name},g' %build export CC='gcc' @@ -275,27 +235,23 @@ cmake . \ -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON - -%__make +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 +find . -name \*.c -or -name \*.cxx -or -name \*.h -or -name \*.hxx -or -name \*.gif | xargs chmod -x %install -#mkdir -p %{buildroot} -#%makeinstall make DESTDIR=%{buildroot} install mv %{buildroot}%{_libdir}/%{name}/lib*.so* %{buildroot}%{_libdir}/ # Gather list of non-python/tcl libraries -ls %{buildroot}%{_libdir}/*.so.* \ - | grep -Ev '(Java|QVTK|Qt|PythonD|TCL)' | sed -e's,^%{buildroot},,' > libs.list +ls %{buildroot}%{_libdir}/*.so.* | grep -Ev '(Java|QVTK|Qt|PythonD|TCL)' | sed -e's,^%{buildroot},,' > libs.list # List of executable utilities cat > utils.list << EOF vtkEncodeString +vtkWrapHierarchy lproj EOF @@ -360,17 +316,12 @@ chmod a+x %{buildroot}%{_libdir}/%{name}/doxygen/*.pl chmod a+x %{buildroot}%{_libdir}/%{name}/testing/*.{py,tcl} # Remove exec bit from non-scripts and %%doc -for file in `find %{buildroot} -type f -perm 0755 \ - | xargs -r file | grep ASCII | awk -F: '{print $1}'`; do +for file in `find %{buildroot} -type f -perm 0755 | xargs -r file | grep ASCII | awk -F: '{print $1}'`; do head -1 $file | grep '^#!' > /dev/null && continue chmod 0644 $file done find Utilities/Upgrading -type f | xargs chmod -x -# Add exec bits to shared libs ... -#chmod 0755 %{buildroot}%{_libdir}/vtk-5.6/CMake/*.so -#chmod 0755 %{buildroot}%{_libdir}/python*/site-packages/vtk/*.so - # Verdict places the docs in the false folder rm -rf %{buildroot}%{_libdir}/vtk/doc @@ -406,16 +357,13 @@ rm -rf %{buildroot} %files -f main.list %defattr(-,root,root,-) -%doc --parents Copyright.txt README.html vtkLogo.jpg vtkBanner.gif Wrapping/*/README* -%doc README.html -%doc vtkLogo.jpg -%doc Copyright.txt +%doc Copyright.txt README.html vtkLogo.jpg vtkBanner.gif Wrapping/*/README* %files devel %defattr(-,root,root,-) %doc Utilities/Upgrading %{_libdir}/%{name}/doxygen -%{_includedir}/%{name}-5.6 +%{_includedir}/%{name}-5.8/ %{_libdir}/%{name}/CMake/ %{_libdir}/%{name}/*.cmake %{_libdir}/%{name}/hints @@ -423,24 +371,24 @@ rm -rf %{buildroot} %files tcl %defattr(-,root,root,-) +%doc README.html +%doc vtkLogo.jpg %{_bindir}/vtkWrapTcl %{_bindir}/vtkWrapTclInit %{_bindir}/vtk %{_libdir}/libvtk*TCL.so.* %{_datadir}/tcl/vtk/ -%doc README.html -%doc vtkLogo.jpg %files -n python-vtk %defattr(-,root,root,-) -%{_libdir}/*PythonD.so.* +%doc README.html +%doc vtkLogo.jpg %{python_sitelib}/%{name}/ +%{_libdir}/*PythonD.so.* %{_prefix}/lib/python%{py_ver}/site-packages/VTK-%{version}-py%{py_ver}.egg-info %{_bindir}/vtkWrapPython %{_bindir}/vtkWrapPythonInit %{_bindir}/vtkpython -%doc README.html -%doc vtkLogo.jpg %files java %defattr(-,root,root,-) @@ -454,25 +402,21 @@ rm -rf %{buildroot} %files testing -f testing.list %defattr(-,root,root,-) -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/testing/ %doc README.html %doc vtkLogo.jpg +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/testing/ %files qt %defattr(-,root,root,-) %{_libdir}/libQVTK.so.* -%{_libdir}/libvtkQtChart.so* -#%{_bindir}/qtevents -#%{_bindir}/qtimageviewer -#%{_bindir}/qtsimpleview %dir %{_prefix}/%{qtdir}/plugins/designer %{_prefix}/%{qtdir}/plugins/designer/libQVTKWidgetPlugin.so %files examples -f examples.list %defattr(-,root,root,-) -%dir %{_libdir}/%{name} %doc README.html %doc vtkLogo.jpg +%dir %{_libdir}/%{name} %changelog