From 1b65c825f03dc7d81259acc16a39dd611eb3ae9b904bc1e07487fc67e40721ef Mon Sep 17 00:00:00 2001 From: Werner Hoch Date: Sat, 3 Jan 2009 17:37:43 +0000 Subject: [PATCH] new version 5.2.1 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=6 --- vtk-5.0.4-gcc43.patch | 33 ----- vtk-5.0.4.tar.bz2 | 3 - ...dir.patch => vtk-5.2.1-pythondestdir.patch | 13 +- vtk-5.2.1.tar.bz2 | 3 + vtk.spec | 123 +++++++++--------- vtkdata-5.0.4.tar.bz2 | 3 - 6 files changed, 74 insertions(+), 104 deletions(-) delete mode 100644 vtk-5.0.4-gcc43.patch delete mode 100644 vtk-5.0.4.tar.bz2 rename vtk-5.0.0-pythondestdir.patch => vtk-5.2.1-pythondestdir.patch (53%) create mode 100644 vtk-5.2.1.tar.bz2 delete mode 100644 vtkdata-5.0.4.tar.bz2 diff --git a/vtk-5.0.4-gcc43.patch b/vtk-5.0.4-gcc43.patch deleted file mode 100644 index 0349ff5..0000000 --- a/vtk-5.0.4-gcc43.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- VTK-5.0.4/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43 2007-05-03 11:12:13.000000000 -0600 -+++ VTK-5.0.4/Utilities/DICOMParser/DICOMAppHelper.cxx 2008-04-11 13:52:05.000000000 -0600 -@@ -31,7 +31,7 @@ - - #include - #include --#include -+#include - #include - #include - #if defined(__BORLANDC__) ---- VTK-5.0.4/Utilities/DICOMParser/DICOMFile.cxx.gcc43 2007-11-07 13:51:57.000000000 -0700 -+++ VTK-5.0.4/Utilities/DICOMParser/DICOMFile.cxx 2008-02-18 10:31:08.000000000 -0700 -@@ -26,7 +26,7 @@ - #include "DICOMFile.h" - - #include --#include -+#include - - DICOMFile::DICOMFile() : InputStream() - { ---- VTK-5.0.4/Utilities/DICOMParser/DICOMParser.cxx.gcc43 2007-11-07 13:51:57.000000000 -0700 -+++ VTK-5.0.4/Utilities/DICOMParser/DICOMParser.cxx 2008-02-18 10:33:07.000000000 -0700 -@@ -39,7 +39,7 @@ - #include - #endif - --#include -+#include - - // Define DEBUG_DICOM to get debug messages sent to dicom_stream::cerr - // #define DEBUG_DICOM diff --git a/vtk-5.0.4.tar.bz2 b/vtk-5.0.4.tar.bz2 deleted file mode 100644 index 33921be..0000000 --- a/vtk-5.0.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:603c704734c73acde08565c2b2f3d92e3caf5b4f0e85bff55cbb281270ce6db1 -size 6319860 diff --git a/vtk-5.0.0-pythondestdir.patch b/vtk-5.2.1-pythondestdir.patch similarity index 53% rename from vtk-5.0.0-pythondestdir.patch rename to vtk-5.2.1-pythondestdir.patch index a782f1c..527fa89 100644 --- a/vtk-5.0.0-pythondestdir.patch +++ b/vtk-5.2.1-pythondestdir.patch @@ -1,11 +1,12 @@ ---- VTK/Wrapping/Python/CMakeLists.txt~ 2005-08-25 21:31:14.000000000 +0200 -+++ VTK/Wrapping/Python/CMakeLists.txt 2006-05-27 13:32:40.000000000 +0200 -@@ -299,7 +299,7 @@ +diff -uNr VTK/Wrapping/Python/CMakeLists.txt new-VTK/Wrapping/Python/CMakeLists.txt +--- VTK/Wrapping/Python/CMakeLists.txt 2008-05-03 21:34:42.000000000 +0200 ++++ new-VTK/Wrapping/Python/CMakeLists.txt 2008-12-31 10:19:27.000000000 +0100 +@@ -348,8 +348,8 @@ + # Create default python setup arguments if they are not set. - IF(DEFINED VTK_PYTHON_SETUP_ARGS) - ELSE(DEFINED VTK_PYTHON_SETUP_ARGS) + IF(NOT DEFINED VTK_PYTHON_SETUP_ARGS) - SET(VTK_PYTHON_SETUP_ARGS "--prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\"" + SET(VTK_PYTHON_SETUP_ARGS "--root=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\" -O1" CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.") MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS) - ENDIF(DEFINED VTK_PYTHON_SETUP_ARGS) + ENDIF(NOT DEFINED VTK_PYTHON_SETUP_ARGS) diff --git a/vtk-5.2.1.tar.bz2 b/vtk-5.2.1.tar.bz2 new file mode 100644 index 0000000..8b550e0 --- /dev/null +++ b/vtk-5.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:714c0dea68f65c65c02319ca495f5c367c64a52fb787aa13b1fe0f3fcfa6dfe2 +size 13953658 diff --git a/vtk.spec b/vtk.spec index 3823617..3e93901 100644 --- a/vtk.spec +++ b/vtk.spec @@ -1,27 +1,30 @@ -%define lib_ver 5.0 +%define lib_ver 5.2 %define qtdir %{_libdir}/qt3 Name: vtk Summary: The Visualization Toolkit - A high level 3D visualization library -Version: %{lib_ver}.4 -Release: 2 +Version: %{lib_ver}.1 +Release: 1 Packager: Werner Hoch License: BSD Group: System Environment/Libraries -Source: http://www.vtk.org/files/release/5.0/vtk-%{version}.tar.bz2 -Source1: http://www.vtk.org/files/release/5.0/vtkdata-%{version}.tar.bz2 -Patch0: vtk-5.0.0-pythondestdir.patch -Patch1: vtk-5.0.4-gcc43.patch URL: http://www.vtk.org +Source: vtk-%{version}.tar.bz2 +Patch0: vtk-5.2.1-pythondestdir.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root + BuildRequires: cmake, tcl-devel, tk-devel, qt3-devel, python-devel -BuildRequires: expat, libjpeg-devel, libpng-devel, freetype2-devel -BuildRequires: libtiff-devel, zlib-devel, doxygen, graphviz +BuildRequires: libexpat-devel, libjpeg-devel, libpng-devel, freetype2-devel +BuildRequires: libtiff-devel, zlib-devel +BuildRequires: doxygen, graphviz, gnuplot # tar-1.14.90+ uses --strip-components option BuildRequires: tar > 1.14.90 BuildRequires: chrpath +%if 0%{?suse_version} >= 1110 +BuildRequires: freeglut-devel +%endif %description VTK is an open-source software system for image processing, 3D @@ -102,7 +105,7 @@ source %prep %setup -n VTK -q %patch0 -p1 -%patch1 -p1 + # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} # otherwise it will break on symlinks. grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \ @@ -122,7 +125,7 @@ cmake . \ -DVTK_WRAP_TCL:BOOL=ON \ -DVTK_USE_PARALLEL:BOOL=ON \ -DVTK_USE_RENDERING:BOOL=ON \ - -DBUILD_DOCUMENTATION:BOOL=ON \ + -DBUILD_DOCUMENTATION:BOOL=OFF \ -DBUILD_EXAMPLES:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DBUILD_TESTING:BOOL=ON \ @@ -142,35 +145,22 @@ cmake . \ make %{_smp_mflags} -cd Utilities/Doxygen -make DoxygenDoc - %install -rm -rf $RPM_BUILD_ROOT make install -if [ "%{_lib}" != lib -a "`ls $RPM_BUILD_ROOT%{_prefix}/lib/*`" != "" ]; then - mkdir -p $RPM_BUILD_ROOT%{_libdir} - mv $RPM_BUILD_ROOT%{_prefix}/%{_lib}/* $RPM_BUILD_ROOT%{_libdir}/ -fi -mv $RPM_BUILD_ROOT%{_prefix}/local/%{_lib}/python* $RPM_BUILD_ROOT%{_libdir}/ -# install doc -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-docs -cp -a Utilities/Doxygen/doc/html $RPM_BUILD_ROOT%{_datadir}/%{name}-docs/api - # install testing-progs and examples find bin -type f | egrep -v '\.' > bin-progs-list install -d $RPM_BUILD_ROOT%{_bindir} install -m 755 `cat bin-progs-list` $RPM_BUILD_ROOT%{_bindir} -# install data -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}-data -tar -xjvf %{SOURCE1} --strip-components 1 \ - -C $RPM_BUILD_ROOT%{_datadir}/%{name}-data -# fix permissions and wrong eol encoding -find $RPM_BUILD_ROOT%{_datadir}/%{name}-data -type f | xargs chmod 644 -sed -i 's/\r//' $RPM_BUILD_ROOT%{_datadir}/%{name}-data/Data/usa.vtk +# generate the package testing-progs lists and store them in file-lists +echo "%defattr (-, root, root)" > testing-progs-list +find $RPM_BUILD_ROOT%{_bindir} -type f | \ + sed -e "s#^$RPM_BUILD_ROOT##" | \ + egrep -v '^%{_bindir}/(qt.*|vtk|pvtk|vtkWrap.*|vtkpython|pvtkpython)$'\ + >> testing-progs-list +# examples and testing files for d in Common Filtering GenericFiltering Graphics Hybrid IO \ Imaging Parallel Rendering VolumeRendering Widgets do @@ -196,21 +186,23 @@ find $RPM_BUILD_ROOT%{_datadir}/%{name}-examples \ find $RPM_BUILD_ROOT%{_datadir}/%{name}-examples \ -name "CMake*" | xargs rm -rf -# generate the package testing-progs lists and store them in file-lists -echo "%defattr (-, root, root)" > testing-progs-list -find $RPM_BUILD_ROOT%{_bindir} -type f | \ - sed -e "s#^$RPM_BUILD_ROOT##" | \ - egrep -v '^%{_bindir}/(qt.*|vtk|pvtk|vtkWrap.*|vtkpython|pvtkpython)$'\ - >> testing-progs-list +# cmake, testing +install -d $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}/CMake +install -d $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}/testing -# set correct execution bit on libs, so they are processed by -# find-debuginfo -find $RPM_BUILD_ROOT%{_libdir} -type f -name \*.so\* | xargs chmod +x +mv $RPM_BUILD_ROOT/%{_libdir}/*.cmake $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver} +mv $RPM_BUILD_ROOT/%{_libdir}/CMake/* $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}/CMake +mv $RPM_BUILD_ROOT/%{_libdir}/hints $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver} +mv $RPM_BUILD_ROOT/%{_libdir}/pkgIndex.tcl $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver} +mv $RPM_BUILD_ROOT/%{_libdir}/testing $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver} +mv $RPM_BUILD_ROOT/%{_libdir}/tcl $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver} -# Make shared libs and scripts executable -chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so.* -chmod a+x $RPM_BUILD_ROOT%{_libdir}/vtk-5.0/doxygen/*.pl -chmod a+x $RPM_BUILD_ROOT%{_libdir}/vtk-5.0/testing/*.{py,tcl} +# remove doxygen scripts and +rm -rf $RPM_BUILD_ROOT/%{_libdir}/doxygen +rm -rf $RPM_BUILD_ROOT/%{_libdir}/doc + +# make scripts executable +chmod a+x $RPM_BUILD_ROOT%{_libdir}/vtk-%{lib_ver}/testing/*.{py,tcl} # Remove exec bit from not-scripts for file in `find $RPM_BUILD_ROOT Utilities/Upgrading -type f -perm 0755 | xargs -r file | grep ASCII | awk -F: '{print $1}'`; do @@ -224,6 +216,14 @@ find $RPM_BUILD_ROOT -size 0 | xargs rm -f # Remove any remnants of rpaths chrpath -d $RPM_BUILD_ROOT%{_bindir}/* +# make doc-dirs +for dir in vtk vtk-devel vtk-tcl vtk-testing-progs ; do + install -d $RPM_BUILD_ROOT/%{_docdir}/"$dir" +done + +%clean +rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig %post tcl -p /sbin/ldconfig @@ -258,6 +258,12 @@ chrpath -d $RPM_BUILD_ROOT%{_bindir}/* %{_libdir}/libvtkWidgets.so.* %{_libdir}/libvtkNetCDF.so.* %{_libdir}/libvtkexoIIc.so.* +%{_libdir}/libvtkInfovis.so.* +%{_libdir}/libvtkViews.so.* +%{_libdir}/libvtklibxml2.so.* +%{_libdir}/libvtkmetaio.so.* +%{_libdir}/libvtksqlite.so.* +%{_libdir}/libvtkverdict.so.* %doc README.html %doc vtkLogo.jpg @@ -266,7 +272,6 @@ chrpath -d $RPM_BUILD_ROOT%{_bindir}/* %files devel %defattr(-,root,root,-) %dir %{_libdir}/vtk-%{lib_ver}/CMake -%dir %{_libdir}/vtk-%{lib_ver}/doxygen %{_includedir}/* %{_libdir}/vtk-%{lib_ver}/CMake/* %{_libdir}/vtk-%{lib_ver}/*.cmake @@ -290,13 +295,18 @@ chrpath -d $RPM_BUILD_ROOT%{_bindir}/* %{_libdir}/libvtk*TCL.so %{_libdir}/libvtk*Python*.so %{_libdir}/libQVTK.so +%{_libdir}/libvtkInfovis.so +%{_libdir}/libvtkViews.so +%{_libdir}/libvtklibxml2.so +%{_libdir}/libvtkmetaio.so +%{_libdir}/libvtksqlite.so +%{_libdir}/libvtkverdict.so %doc README.html %doc vtkLogo.jpg %defattr(0644,root,root,-) %doc Utilities/Upgrading/*.txt %doc Utilities/Upgrading/*.pdf %doc Utilities/Upgrading/*.cmake -%doc %{_libdir}/vtk-%{lib_ver}/doxygen/* %files testing-progs -f testing-progs-list %defattr(-,root,root,-) @@ -319,12 +329,13 @@ chrpath -d $RPM_BUILD_ROOT%{_bindir}/* %files python %defattr(-,root,root,-) +%dir %{_libdir}/vtk-%{lib_ver}/testing %{_bindir}/vtkWrapPython %{_bindir}/vtkWrapPythonInit %{_bindir}/vtkpython %{_libdir}/libvtk*Python*.so.* -%{_libdir}/python*/site-packages/* -%{_libdir}/vtk-%{lib_ver}/testing/*.py* +%{py_sitedir}/* +%{_libdir}/vtk-%{lib_ver}/testing/*.py %files qt @@ -339,23 +350,17 @@ chrpath -d $RPM_BUILD_ROOT%{_bindir}/* %defattr(-,root,root,-) %{_datadir}/%{name}-examples -%files data -%defattr(-,root,root,-) -%{_datadir}/%{name}-data - -%files doc -%defattr(-,root,root,-) -%{_datadir}/%{name}-docs - -%clean -rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 03 2009 Werner Hoch - 5.2.1 +- removed vtk-data +- removed vtk-doc (doxygen) +- new version 5.2.1 +- build fixes for openSUSE 11.1 * Sat Aug 09 2008 Werner Hoch - 5.0.4 - switched to the specfile from Jaroslaw Zachwieja http://www2.warwick.ac.uk/fac/sci/csc/people/computingstaff/jaroslaw_zachwieja/vtk/ - use qt3 instead of qt4 - * Thu Jul 18 2008 Werner Hoch - 5.0.4 - specfile taken from fedora core 9 and adapted to opensuse diff --git a/vtkdata-5.0.4.tar.bz2 b/vtkdata-5.0.4.tar.bz2 deleted file mode 100644 index 32e379c..0000000 --- a/vtkdata-5.0.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d57aa7a143abde4175aa0159d788f9902fa462200b58132f70cb5812d8be30b -size 22177718