updated vtk to 5.4.2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@945 ec354946-7b23-47d6-9f5a-488ba84defc7

v/vtk/vtk-vl.spec

@@ -1,45 +1,41 @@
-%define name vtk
+%define vtkver 5.4
-%define major_version 5.0
+%define version %{vtkver}.2
-%define minor_version 4
+%define vtkdata_dir %{_datadir}/vtk-data-%{version}
-%define version %{major_version}.%{minor_version}
+%define qt_designer_plugins_dir %(qmake -query QT_INSTALL_PREFIX)/plugins/designer
-%define release 1%{?_dist_release}
+
-%define data_version 5.0.4
+Summary: The Visualization Toolkit - A high level 3D visualization library
-%define ruby /usr/bin/ruby
+Summary: The Visualization Toolkit - ハイレベル3D可視化ライブラリ
-%define rlibdir %(%{ruby} -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
+Group: System Environment/Libraries
-%define rarchdir %(%{ruby} -r rbconfig -e 'print Config::CONFIG["archdir"]')
+Name: vtk
-%define qt_dir %{_libdir}/qt3
-%define qt_designer_plugins_dir %{qt_dir}/plugins/designer
-%define py_ver %(python -c 'import sys; print sys.version[:3]')
-%define py_dir %{_libdir}/python%{py_ver}
-Name: %{name}
 Version: %{version}
-Release: %{release}
+Release: 1%{?_dist_release}
 Source0: vtk-%{version}.tar.gz
-Source1: vtkdata-%{data_version}.tar.gz
+Source1: vtkdata-%{version}.tar.gz
+
 Patch0: vtk-5.0-getsockname.patch
 Patch1: http://www.gfd-dennou.org/arch/ruby/products/ruby-vtk/vtk-ruby-060915.patch
+Patch2: vtk-5.2.1-boost-1.42.patch
+
 License: BSD style
 URL: http://www.vtk.org/
 
-BuildPrereq: cmake >= 2.0.0
+BuildRequires: cmake >= 2.0.0
-#BuildPrereq: XOrg-devel, XOrg-gl-devel
+BuildRequires: xorg-x11-devel, mesa-libGL-devel
-BuildPrereq: xorg-x11-devel, mesa-libGL-devel
+BuildRequires: expat-devel, zlib-devel
-BuildPrereq: expat-devel, zlib-devel
+BuildRequires: netcdf
-BuildPrereq: netcdf
+BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, freetype2-devel
-BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, freetype2-devel
+BuildRequires: tcl, tk, python, python-devel
-BuildPrereq: tcl, tk, python, python-devel, ruby, ruby-devel
+#BuildRequires: ruby, ruby-devel
-BuildPrereq: qt-devel
+BuildRequires: qt-devel
+BuildRequires: libboost-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-Summary: The Visualization Toolkit - A high level 3D visualization library
-Summary: The Visualization Toolkit - ハイレベル3D可視化ライブラリ
-Group: System Environment/Libraries
 Requires: cmake
-#Requires: XOrg, XOrg-gl
 Requires: xorg-x11-libs, mesa-libGL
 Requires: expat, zlib
 Requires: netcdf
 Requires: libjpeg, libpng, libtiff, freetype2
+Obsoletes: %{name}-ruby < %{version}
 
 %description
 VTK - the Visualization Toolkit is an object oriented, high
@@ -99,16 +95,15 @@ python scripts.  You will need python and vtk installed to use this.
 Remember to set your PYTHONPATH variable properly before running your
 scripts.
 
-%package ruby
+#%package ruby
-Summary: Ruby bindings for VTK.
+#Summary: Ruby bindings for VTK.
-Group: Applications/Engineering
+#Group: Applications/Engineering
-Requires: %{name} = %{version}-%{release}
+#Requires: %{name} = %{version}-%{release}
-Requires: ruby
+#Requires: ruby
-
+#
-%description ruby 
+#%description ruby 
-This provides the shared libraries that enable one to use VTK from
+#This provides the shared libraries that enable one to use VTK from
-ruby scripts.  You will need ruby and vtk installed to use this.
+#ruby scripts.  You will need ruby and vtk installed to use this.
-
 
 %package qt
 Summary: QT VTK widget
@@ -156,76 +151,69 @@ These data are required to run various examples from the examples package.
 
 %prep
 %setup -q -n VTK
-%patch0 -p1
+#%patch0 -p1 -b .getsockname
-%patch1 -p1
+#%patch1 -p1 -b .ruby-060915
-
+%patch2 -p1 -b .boost-1.42
-cmake . \
-        -DCMAKE_CXX_COMPILER:STRING=g++ \
-        -DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS -Wno-deprecated" \
-        -DCMAKE_CXX_FLAGS_DEBUG:STRING=-g \
-        -DCMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os \
-        -DCMAKE_CXX_FLAGS_RELEASE:STRING="-O2 -finline-functions" \
-        -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-O2 -g" \
-        -DCMAKE_C_COMPILER:STRING=gcc \
-        -DCMAKE_C_FLAGS:STRING="$RPM_OPT_FLAGS" \
-        -DCMAKE_C_FLAGS_DEBUG:STRING=-g \
-        -DCMAKE_C_FLAGS_MINSIZEREL:STRING=-Os \
-        -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -finline-functions" \
-        -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-O2 -g" \
-        -DCMAKE_BUILD_TYPE:STRING=Release \
-        -DCMAKE_HP_PTHREADS:BOOL=OFF \
-        -DCMAKE_USE_PTHREADS:BOOL=ON \
-        -DCMAKE_USE_SPROC:BOOL=OFF \
-        -DEXECUTABLE_OUTPUT_PATH:PATH=$RPM_BUILD_DIR/VTK/bin \
-        -DCMAKE_INSTALL_PREFIX:PATH=%{prefix} \
-        -DCMAKE_USE_RELATIVE_PATHS:BOOL=OFF \
-        -DVTK_DATA_ROOT:PATH=%{_datadir}/vtk-data-%{version} \
-        -DVTK_WRAP_PYTHON:BOOL=ON \
-        -DVTK_WRAP_RUBY:BOOL=ON \
-        -DVTK_WRAP_TCL:BOOL=ON \
-        -DVTK_USE_PARALLEL:BOOL=ON \
-        -DVTK_USE_HYBRID:BOOL=ON \
-        -DVTK_USE_RENDERING:BOOL=ON \
-        -DBUILD_DOCUMENTATION:BOOL=ON \
-        -DBUILD_EXAMPLES:BOOL=OFF \
-        -DBUILD_SHARED_LIBS:BOOL=ON \
-        -DBUILD_TESTING:BOOL=ON \
-        -DVTK_USE_GUISUPPORT:BOOL=ON \
-        -DVTK_USE_QVTK:BOOL=ON \
-        -DQT_INCLUDE_DIR:FILEPATH=%{qt_dir}/include \
-        -DQT_MOC_EXECUTABLE:FILEPATH=%{_bindir}/moc \
-        -DQT_QASSISTANTCLIENT_LIBRARY:FILEPATH=%{qt_dir}/lib/libqassistantclient.a \
-        -DQT_QT_LIBRARY:FILEPATH=%{qt_dir}/lib/libqt-mt.so \
-        -DQT_UIC_EXECUTABLE:FILEPATH=%{_bindir}/bin/uic \
-        -DVTK_INSTALL_QT_PLUGIN_DIR:STRING=%{qt_designer_plugins_dir} \
-        -DVTK_USE_RPATH:BOOL=OFF \
-        -DVTK_LEGACY_REMOVE:BOOL=ON \
-        -DVTK_USE_GL2PS:BOOL=ON \
-        -DVTK_RUBY_LIB_DIR=%{rlibdir} \
-        -DVTK_RUBY_ARCH_DIR=%{rarchdir} \
-        -DVTK_RUBY_SETUP_ARGS:STRING=--prefix="$RPM_BUILD_ROOT" \
-        -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-        -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-        -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
-        -DVTK_USE_SYSTEM_PNG:BOOL=ON \
-        -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
-        -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-		-DVTK_INSTALL_LIB_DIR:PATH=/%{_lib} \
-        -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=$RPM_BUILD_ROOT%{_prefix} --install-lib=$RPM_BUILD_ROOT%{py_dir}/site-packages" \
-        -DLIBRARY_OUTPUT_PATH:PATH=$RPM_BUILD_DIR/VTK/%{_lib} \
-        -DPYTHON_INCLUDE_PATH:PATH=%{_includedir}/python%{py_ver} \
-        -DPYTHON_LIBRARY:FILEPATH=%{py_dir}/config/libpython%{py_ver}.a \
 
+# fix data path
+find . -type f | xargs sed -i -e 's|../../../../VTKData|%{vtkdata_dir}|g'
 
 %build
+## This section wad fixed reference to Mandriva package
+# Remove old cmake files
+rm -f CMake/FindBoost*
+
+# Due to cmake prefix point already for _prefix, we need
+# push only the necessary extra paths
+%cmake \
+	-DVTK_INSTALL_BIN_DIR:PATH=/bin \
+	-DVTK_INSTALL_PACKAGE_DIR=/%{_lib}/vtk-%{vtkver} \
+	-DVTK_INSTALL_INCLUDE_DIR:PATH=/include/vtk-%{vtkver} \
+	-DVTK_PYTHON_MODULE_PLATFORM_INSTALL_DIR=/%{_lib}/pyhton%{pyver}/site-packages \
+	-DVTK_DATA_ROOT:PATH=/share/vtk-%{vtkver} \
+	\
+	-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \
+	-DVTK_WRAP_PYTHON:BOOL=ON \
+	-DVTK_WRAP_JAVA:BOOL=OFF \
+	-DVTK_WRAP_TCL:BOOL=ON \
+	-DVTK_USE_RENDERING:BOOL=ON \
+	-DDESIRED_QT_VERSION=4 \
+	-DBUILD_DOCUMENTATION:BOOL=OFF \
+	-DBUILD_EXAMPLES:BOOL=ON \
+	-DBUILD_SHARED_LIBS:BOOL=ON \
+	-DBUILD_TESTING:BOOL=ON \
+	-DVTK_USE_SYSTEM_EXPAT=ON \
+	-DVTK_USE_SYSTEM_JPEG=ON \
+	-DVTK_USE_SYSTEM_PNG=ON \
+	-DVTK_USE_SYSTEM_TIFF=ON \
+	-DVTK_USE_SYSTEM_ZLIB=ON \
+	-DVTK_USE_SYSTEM_FREETYPE=ON \
+	-DVTK_USE_ANSI_STDLIB:BOOL=ON \
+	-DVTK_USE_PARALLEL:BOOL=ON \
+	-DVTK_USE_GUISUPPORT:BOOL=ON \
+	-DVTK_USE_QVTK=ON \
+	-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=%{_prefix} --root=%{buildroot}" \
+	-DVTK_INSTALL_QT_PLUGIN_DIR=%{qt_designer_plugins_dir} \
+	-DVTK_USE_GL2PS:BOOL=ON \
+	-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \
+	-DVTK_USE_QVTK_QTOPENGL:BOOL=ON \
+	-DVTK_USE_BOOST:BOOL=ON \
+	;
+
 %__make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export VTKPYTHONPATH=%{py_dir}/site-packages
 %makeinstall DESTDIR=$RPM_BUILD_ROOT
 
+%if %{_lib} == lib64
+	mkdir -p $RPM_BUILD_ROOT%{_libdir}
+	mv $RPM_BUILD_ROOT%{_prefix}/lib/python%{pyver} $RPM_BUILD_ROOT%{_libdir}/
+	mv $RPM_BUILD_ROOT%{_prefix}/lib/vtk-%{vtkver}/* $RPM_BUILD_ROOT%{_libdir}/vtk-%{vtkver}/
+%endif
+mv $RPM_BUILD_ROOT%{_libdir}/vtk-%{vtkver}/lib*.so* $RPM_BUILD_ROOT%{_libdir}/
+
 rm -f bin/*.so*
 install -m 755 bin/* $RPM_BUILD_ROOT%{_bindir}
 rm -rf doc
@@ -249,10 +237,12 @@ find ${RPM_BUILD_ROOT}%{_bindir} -type f | \
         egrep -v '^%{_bindir}/(vtk|pvtk|vtkWrap.*|vtkParseJava|VTKJavaExecutable|vtkpython|pvtkpython)$' \
         >> testing-progs-list
 
-
 tar zxvf %{SOURCE1}
 install -d $RPM_BUILD_ROOT%{_datadir}
-cp -r VTKData $RPM_BUILD_ROOT%{_datadir}/vtk-data-%{version}
+cp -r VTKData $RPM_BUILD_ROOT/%{vtkdata_dir}
+
+# Remove any possible verdict docs
+rm -rf %buildroot/%{_libdir}/vtk-%{vtkver}/doc
 
 
 %post -p /sbin/ldconfig
@@ -268,66 +258,30 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc Copyright.txt README.html TestingLogo.gif vtkLogo.jpg
-%{_libdir}/libvtkCommon.so.*
+%{_libdir}/*.so.*
-%{_libdir}/libvtkFiltering.so.*
-%{_libdir}/libvtkGenericFiltering.so.*
-%{_libdir}/libvtkGraphics.so.*
-%{_libdir}/libvtkHybrid.so.*
-%{_libdir}/libvtkIO.so.*
-%{_libdir}/libvtkImaging.so.*
-%{_libdir}/libvtkParallel.so.*
-%{_libdir}/libvtkRendering.so.*
-%{_libdir}/libvtkVolumeRendering.so.*
-%{_libdir}/libvtkWidgets.so.*
-%{_libdir}/libvtkexoIIc.so.*
-%{_libdir}/libvtkftgl.so.*
-%{_libdir}/libvtksys.so.*
-%{_libdir}/libvtkDICOMParser.so.*
-#%{_libdir}/libvtkMPEG2Encode.so.*
-%{_libdir}/libvtkNetCDF.so.*
-
 
 %files devel
 %defattr(-,root,root)
-%doc Utilities/Upgrading/*
+%doc Utilities/Upgrading
-%doc %{_libdir}/vtk-%{major_version}/doxygen/*
+%doc %{_libdir}/vtk-%{vtkver}/doxygen
-%{_includedir}/vtk-%{major_version}/
+%{_includedir}/vtk-%{vtkver}/
-%{_libdir}/vtk-%{major_version}/CMake/
+%{_libdir}/*.so
-%{_libdir}/vtk-%{major_version}/*.cmake
+%{_libdir}/vtk-%{vtkver}/CMake/
-%{_libdir}/vtk-%{major_version}/hints
+%{_libdir}/vtk-%{vtkver}/*.cmake
-%{_libdir}/libvtkCommon.so
+%{_libdir}/vtk-%{vtkver}/hints
-%{_libdir}/libvtkFiltering.so
-%{_libdir}/libvtkGenericFiltering.so
-%{_libdir}/libvtkGraphics.so
-%{_libdir}/libvtkHybrid.so
-%{_libdir}/libvtkIO.so
-%{_libdir}/libvtkImaging.so
-%{_libdir}/libvtkParallel.so
-%{_libdir}/libvtkRendering.so
-%{_libdir}/libvtkVolumeRendering.so
-%{_libdir}/libvtkWidgets.so
-%{_libdir}/libvtkexoIIc.so
-%{_libdir}/libvtkftgl.so
-%{_libdir}/libvtksys.so
-%{_libdir}/libvtkDICOMParser.so
-#%{_libdir}/libvtkMPEG2Encode.so
-%{_libdir}/libvtkNetCDF.so
-%{_libdir}/libvtk*TCL.so
-%{_libdir}/libvtk*Python*.so
-%{_libdir}/libQVTK.so
 %{qt_designer_plugins_dir}/libQVTKWidgetPlugin.so
 
 
 %files tcl
 %defattr(-,root,root)
-%dir %{_libdir}/vtk-%{major_version}/testing
+%dir %{_libdir}/vtk-%{vtkver}/testing
 %{_bindir}/vtk
 %{_bindir}/vtkWrapTcl
 %{_bindir}/vtkWrapTclInit
 %{_libdir}/libvtk*TCL.so.*
-%{_libdir}/vtk-%{major_version}/tcl/
+%{_libdir}/vtk-%{vtkver}/tcl/
-%{_libdir}/vtk-%{major_version}/testing/*tcl
+%{_libdir}/vtk-%{vtkver}/testing/*tcl
-%{_libdir}/vtk-%{major_version}/pkgIndex.tcl
+%{_libdir}/vtk-%{vtkver}/pkgIndex.tcl
 
 
 %files python
@@ -336,20 +290,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/vtkWrapPython
 %{_bindir}/vtkWrapPythonInit
 %{_libdir}/libvtk*Python*.so.*
-%{_libdir}/python%{py_ver}/site-packages/vtk/
+%{_libdir}/python%{pyver}/site-packages/*
-%{_libdir}/python%{py_ver}/site-packages/VTK-%{version}-py%{py_ver}.egg-info
+%{_libdir}/vtk-%{vtkver}/testing/*py
-%{_libdir}/vtk-%{major_version}/testing/*py
 
 
-%files ruby
+#%files ruby
-%defattr(-,root,root)
+#%defattr(-,root,root)
-%{_bindir}/vtkruby
+#%{_bindir}/vtkruby
-%{_bindir}/vtkWrapRuby
+#%{_bindir}/vtkWrapRuby
-%{_bindir}/vtkWrapRubyInit
+#%{_bindir}/vtkWrapRubyInit
-%{_libdir}/libvtk*Ruby*.so*
+#%{_libdir}/libvtk*Ruby*.so*
-%{rlibdir}/vtk.rb
+#%{rlibdir}/vtk.rb
-%{rlibdir}/vtk/
+#%{rlibdir}/vtk/
-%{rarchdir}/vtk/
+#%{rarchdir}/vtk/
 
 
 %files qt
@@ -368,10 +321,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files data
 %defattr(-,root,root)
-%{_datadir}/vtk-data-%{version}
+%{vtkdata_dir}
 
 
 %changelog
+* Tue May 04 2010 Shu KONNO <owa@bg.wakwak.com> 5.4.2-1
+- updated vtk to 5.4.2
+- updated vtkdata to 5.4.2
+- added Obsoletes: %%{name}-ruby < 5.4.2
+- added Patch2: vtk-5.2.1-boost-1.42.patch (from Mandriva)
+- dropt Patch0: vtk-5.0-getsockname.patch
+- dropt Patch1: vtk-ruby-060915.patch
+
 * Thu Jul 31 2008 Shu KONNO <owa@bg.wakwak.com> 5.0.4-1vl5
 - updated vtk to 5.0.4
 - updated vtkdata to 5.0.4