[packages/vtk] - updated to 6.0.0 - dropped bconds r,sip,odbc,chemistry and textanalysis as they are either dropp
baggins
baggins at pld-linux.org
Sat Jul 13 20:18:20 CEST 2013
commit ed317954b20d523ae8779acffad70cb581ed6ccc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Jul 13 20:16:27 2013 +0200
- updated to 6.0.0
- dropped bconds r,sip,odbc,chemistry and textanalysis as they are
either dropped upstream or doesn'h make much sense
- dropped python-{qt,sip}, no longer exist upstream
vtk-chemistry.patch | 8 +-
vtk-ffmpeg.patch | 87 ------
vtk-install.patch | 15 +
vtk-system-libs.patch | 41 +--
vtk-vtkNetCDF_cxx-soname.patch | 11 -
vtk-vtknetcdf-lm.patch | 10 -
vtk.spec | 676 +++++++++--------------------------------
7 files changed, 190 insertions(+), 658 deletions(-)
---
diff --git a/vtk.spec b/vtk.spec
index e2c0239..5cbb99b 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -5,31 +5,24 @@
#
# Conditional build
%bcond_without java # Java wrappers
-%bcond_without r # R interface
-%bcond_without sip # Python wrappers available to SIP/PyQt
%bcond_without ffmpeg # FFMPEG .avi saving support
-%bcond_without odbc # ODBC database interface
-%bcond_without chemistry # Chemistry module (requires OpenQube)
-%bcond_without textanalysis # TextAnalysis module (requires QtXmlPatterns)
%bcond_with OSMesa # build with OSMesa (https://bugzilla.redhat.com/show_bug.cgi?id=744434)
%bcond_with system_proj # use system PROJ.4 (needs 4.3 with exposed internals, not ready for 4.4+)
#
Summary: Toolkit for 3D computer graphics, image processing, and visualization
Summary(pl.UTF-8): Zestaw narzędzi do trójwymiarowej grafiki, przetwarzania obrazu i wizualizacji
Name: vtk
-Version: 5.10.1
-Release: 5
+Version: 6.0.0
+Release: 1
License: BSD
Group: Libraries
-Source0: http://www.vtk.org/files/release/5.10/%{name}-%{version}.tar.gz
-# Source0-md5: 264b0052e65bd6571a84727113508789
-Source1: http://www.vtk.org/files/release/5.10/%{name}data-%{version}.tar.gz
-# Source1-md5: b6355063264cd56bcd1396c92f6ca59a
+Source0: http://www.vtk.org/files/release/6.0/%{name}-%{version}.tar.gz
+# Source0-md5: 72ede4812c90bdc55172702f0cad02bb
+Source1: http://www.vtk.org/files/release/6.0/%{name}data-%{version}.tar.gz
+# Source1-md5: f40bcfe92439575ae56aa3f2fcd30149
Patch0: %{name}-system-libs.patch
-Patch1: %{name}-vtkNetCDF_cxx-soname.patch
-Patch2: %{name}-vtknetcdf-lm.patch
-Patch3: %{name}-ffmpeg.patch
-Patch4: %{name}-chemistry.patch
+Patch1: %{name}-install.patch
+Patch2: %{name}-chemistry.patch
URL: http://www.vtk.org/
%{?with_OSMesa:BuildRequires: Mesa-libOSMesa-devel}
BuildRequires: OpenGL-GLX-devel
@@ -39,17 +32,16 @@ BuildRequires: QtGui-devel >= 4.5.0
BuildRequires: QtNetwork-devel >= 4.5.0
BuildRequires: QtSql-devel >= 4.5.0
BuildRequires: QtWebKit-devel >= 4.5.0
-%{?with_textanalysis:BuildRequires: QtXmlPatterns-devel >= 4.5.0}
-%{?with_r:BuildRequires: R}
+BuildRequires: QtXmlPatterns-devel >= 4.5.0
BuildRequires: boost-devel >= 1.39
BuildRequires: cmake >= 2.6.3
BuildRequires: doxygen
-%{?with_chemistry:BuildRequires: eigen >= 2}
+BuildRequires: eigen >= 2
BuildRequires: expat-devel
%{?with_ffmpeg:BuildRequires: ffmpeg-devel}
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel >= 2
-BuildRequires: gl2ps-devel
+BuildRequires: gl2ps-devel >= 1.3.8
BuildRequires: gnuplot
BuildRequires: graphviz
BuildRequires: hdf5-devel
@@ -66,20 +58,17 @@ BuildRequires: libtiff-devel
BuildRequires: libxml2-devel >= 2
BuildRequires: mysql-devel
BuildRequires: openmotif-devel
-%{?with_chemistry:BuildRequires: openqube-devel}
+BuildRequires: openqube-devel
BuildRequires: postgresql-devel
%{?with_system_proj:BuildRequires: proj-devel >= 4.3, proj-devel < 4.4}
BuildRequires: python-devel
-%if %{with sip}
BuildRequires: python-sip-devel
BuildRequires: python-PyQt4-devel
-%endif
BuildRequires: qt4-build >= 4.5.0
BuildRequires: rpmbuild(macros) >= 1.605
-%{?with_sip:BuildRequires: sip}
+BuildRequires: sip
BuildRequires: tcl-devel
BuildRequires: tk-devel
-%{?with_odbc:BuildRequires: unixODBC-devel}
BuildRequires: wget
BuildRequires: xorg-lib-libICE-devel
BuildRequires: xorg-lib-libSM-devel
@@ -89,7 +78,7 @@ BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXft-devel
BuildRequires: xorg-lib-libXt-devel
BuildRequires: zlib-devel
-%{?with_textanalysis:Requires: QtXmlPatterns >= 4.5.0}
+Requires: QtXmlPatterns >= 4.5.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define skip_post_check_so lib.*Python.*\.so.*
@@ -125,6 +114,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe VTK dla C++
Group: Development
Requires: %{name} = %{version}-%{release}
Requires: libstdc++-devel
+Obsoletes: vtk-qt-devel < 6.0.0-1
%description devel
This provides the VTK header files required to compile C++ programs
@@ -135,31 +125,16 @@ Ten pakiet dostarcza pliki nagłówkowe VTK do kompilowania programów
C++ używających VTK do wizualizacji 3D.
%package qt
-Summary: Qt bindings for VTK
-Summary(pl.UTF-8): Wiązania Qt do VTK
+Summary: Qt designer plugin for VTK
+Summary(pl.UTF-8): Wtyczka Qt designer-a do VTK
Group: X11/Libraries
Requires: %{name} = %{version}-%{release}
%description qt
-This package contains Qt bindings for VTK.
+Qt designer plugin for VTK.
%description qt -l pl.UTF-8
-Ten pakiet zawiera wiązania Qt do VTK.
-
-%package qt-devel
-Summary: Header files for Qt VTK bindings
-Summary(pl.UTF-8): Pliki nagłówkowe wiązania Qt do VTK
-Group: X11/Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-qt = %{version}-%{release}
-Requires: QtCore-devel
-Requires: QtGui-devel
-
-%description qt-devel
-Header files for Qt VTK bindings.
-
-%description qt-devel -l pl.UTF-8
-Pliki nagłówkowe wiązania Qt do VTK.
+Wtyczka Qt designer-a do VTK.
%package java
Summary: Java bindings for VTK
@@ -193,6 +168,8 @@ Summary: Python bindings for VTK
Summary(pl.UTF-8): Wiązania Pythona do VTK
Group: Libraries
Requires: %{name} = %{version}-%{release}
+Obsoletes: vtk-python-qt < 6.0.0-1
+Obsoletes: vtk-python-sip < 6.0.0-1
%description python
This package contains Python bindings for VTK.
@@ -214,31 +191,6 @@ Header files for Python VTK binding.
%description python-devel -l pl.UTF-8
Pliki nagłówkowe wiązania Pythona do VTK.
-%package python-sip
-Summary: Python SIP bindings for VTK
-Summary(pl.UTF-8): Wiązania Pythona SIP do VTK
-Group: Libraries
-Requires: %{name}-python = %{version}-%{release}
-
-%description python-sip
-This package contains Python SIP bindings for VTK.
-
-%description python-sip -l pl.UTF-8
-Ten pakiet zawiera wiązania Pythona SIP do VTK.
-
-%package python-qt
-Summary: Python bindings for VTK Qt components
-Summary(pl.UTF-8): Wiązania Pythona do elementów Qt pakietu VTK
-Group: Libraries
-Requires: %{name}-python = %{version}-%{release}
-Requires: %{name}-qt = %{version}-%{release}
-
-%description python-qt
-This package contains Python bindings for VTK Qt components.
-
-%description python-qt -l pl.UTF-8
-Ten pakiet zawiera wiązania Pythona do elementów Qt pakietu VTK.
-
%package tcl
Summary: Tcl bindings for VTK
Summary(pl.UTF-8): Wiązania języka Tcl do VTK
@@ -323,8 +275,6 @@ potrzebne do uruchamiania różnych przykładów z pakietu vtk-examples.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
# Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version}
# otherwise it will break on symlinks.
@@ -349,12 +299,11 @@ mkdir build
cd build
%cmake .. \
-DBUILD_DOCUMENTATION:BOOL=ON \
- -DBUILD_EXAMPLES:BOOL=ON \
+ -DBUILD_EXAMPLES:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
-DBUILD_TESTING:BOOL=ON \
-DCMAKE_C_COMPILER:PATH="%{__cc}" \
-DCMAKE_CXX_COMPILER:PATH="%{__cxx}" \
- -DCMAKE_LINKER_FLAGS:STRING="%{rpmldflags}" \
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DOPENGL_INCLUDE_PATH:PATH=%{_includedir}/GL \
-DPYTHON_INCLUDE_PATH:PATH=%{py_incdir} \
@@ -365,30 +314,21 @@ cd build
-DTK_INCLUDE_PATH:PATH=%{_includedir} \
-DTK_LIBRARY:PATH=%{_libdir}/libtk.so \
-DVTK_DATA_ROOT:PATH=%{_datadir}/vtk \
- -DVTK_INSTALL_INCLUDE_DIR:PATH=/include/vtk \
- -DVTK_INSTALL_LIB_DIR:PATH=/%{_lib}/vtk \
+ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \
+ -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/vtk \
+ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \
+ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/vtk \
+ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \
+ -DVTK_INSTALL_TCL_DIR:PATH=share/tcl%{tcl_version}/vtk \
-DVTK_INSTALL_QT_DIR=/%{_lib}/qt4/plugins/designer \
%{?with_OSMesa:-DVTK_OPENGL_HAS_OSMESA:BOOL=ON} \
+ -DVTK_WRAP_PYTHON:BOOL=ON \
-DVTK_PYTHON_SETUP_ARGS="--prefix=/usr --root=$RPM_BUILD_ROOT" \
-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
- -DVTK_USE_BOOST:BOOL=ON \
- %{?with_chemistry:-DVTK_USE_CHEMISTRY:BOOL=ON} \
- %{?with_ffmpeg:-DVTK_USE_FFMPEG_ENCODER:BOOL=ON -DVTK_FFMPEG_HAS_OLD_HEADER:BOOL=OFF} \
- -DVTK_USE_GL2PS:BOOL=ON \
- %{?with_r:-DVTK_USE_GNU_R:BOOL=ON -DR_INCLUDE_DIR=/usr/include/R -DR_LIBRARY_BLAS=%{_libdir}/libblas.so -DR_LIBRARY_LAPACK=%{_libdir}/liblapack.so} \
- -DVTK_USE_GUISUPPORT:BOOL=ON \
- -DVTK_USE_MYSQL:BOOL=ON \
- %{?with_odbc:-DVTK_USE_ODBC:BOOL=ON -DODBC_LIBRARY=%{_libdir}/libodbc.so} \
-DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \
- -DVTK_USE_PARALLEL:BOOL=ON \
- -DVTK_USE_POSTGRES:BOOL=ON \
- -DVTK_USE_QT:BOOL=ON \
- -DVTK_USE_QVTK:BOOL=ON \
-DVTK_USE_RENDERING:BOOL=ON \
- -DNETCDF_ENABLE_NETCDF4:BOOL=ON \
-DVTK_USE_SYSTEM_HDF5:BOOL=ON \
%{!?with_system_proj:-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF} \
- %{?with_textanalysis:-DVTK_USE_TEXT_ANALYSIS:BOOL=ON} \
%if %{with java}
-DVTK_WRAP_JAVA:BOOL=ON \
-DJAVA_INCLUDE_PATH:PATH=$JAVA_HOME/include \
@@ -399,7 +339,14 @@ cd build
%endif
-DVTK_WRAP_PYTHON:BOOL=ON \
%{?with_sip:-DVTK_WRAP_PYTHON_SIP:BOOL=ON} \
- -DVTK_WRAP_TCL:BOOL=ON
+ -DVTK_WRAP_TCL:BOOL=ON \
+ -DVTK_Group_Imaging:BOOL=ON \
+ -DVTK_Group_Qt:BOOL=ON \
+ -DVTK_Group_Rendering:BOOL=ON \
+ -DVTK_Group_StandAlone:BOOL=ON \
+ -DVTK_Group_Tk:BOOL=ON \
+ -DVTK_Group_Views:BOOL=ON \
+ -DModule_vtkFiltersStatisticsGnuR:BOOL=ON
%{__make}
@@ -417,7 +364,7 @@ echo %{_libdir}/vtk > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.co
# fix python install path
mv $RPM_BUILD_ROOT%{py_sitescriptdir}/* $RPM_BUILD_ROOT%{py_sitedir}
-cp -a VTKData%{version}/* $RPM_BUILD_ROOT%{_datadir}/vtk-data
+cp -a VTKDATA%{version}/* $RPM_BUILD_ROOT%{_datadir}/vtk-data
cp -a vtk-examples/Examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
# Install utilities
@@ -425,53 +372,63 @@ install build/bin/lproj $RPM_BUILD_ROOT%{_bindir}
# Install examples
for f in \
-HierarchicalBoxPipeline \
-MultiBlock \
-Arrays \
-Cube \
-RGrid \
-SGrid \
-Medical1 \
-Medical2 \
-Medical3 \
-finance \
AmbientSpheres \
-Cylinder \
-DiffuseSpheres \
-SpecularSpheres \
+Arrays \
+BalloonWidget \
+BandedContours \
Cone \
Cone2 \
Cone3 \
Cone4 \
Cone5 \
-Cone6 ; do
+Cone6 \
+Cube \
+Cylinder \
+Delaunay3D \
+Delaunay3DAlpha \
+DiffuseSpheres \
+DumpXMLFile \
+FilledContours \
+FixedPointVolumeRayCastMapperCT \
+GPURenderDemo \
+Generate2DAMRDataSetWithPulse \
+Generate3DAMRDataSetWithPulse \
+GenerateCubesFromLabels \
+GenerateModelsFromLabels \
+HierarchicalBoxPipeline \
+ImageDataLIC2DDemo \
+ImageSlicing \
+LabeledMesh \
+MaterialObjects \
+Medical1 \
+Medical2 \
+Medical3 \
+MultiBlock \
+ParticleReader \
+RGrid \
+SGrid \
+Slider \
+Slider2D \
+SpecularSpheres \
+StructuredGridLIC2DDemo \
+SurfaceLICDemo \
+TimeRenderer \
+TimeRenderer2 \
+TubesWithVaryingRadiusAndColors \
+finance ; do
install build/bin/$f $RPM_BUILD_ROOT%{_bindir}
done
# Install test binaries
-for f in \
-CommonCxxTests \
-TestCxxFeatures \
-TestInstantiator \
-FilteringCxxTests \
-GraphicsCxxTests \
-GenericFilteringCxxTests \
-ImagingCxxTests \
-IOCxxTests \
-RenderingCxxTests \
-VTKBenchMark \
-VolumeRenderingCxxTests \
-WidgetsCxxTests \
-SocketClient \
-SocketServer ; do
- install build/bin/$f $RPM_BUILD_ROOT%{_bindir}
+for f in build/bin/*Tests build/bin/Test* build/bin/VTKBenchMark ; do
+ install $f $RPM_BUILD_ROOT%{_bindir}
done
-# Add exec bits to shared libs ...
-#chmod 0755 %{buildroot}%{_libdir}/python*/site-packages/vtk/*.so
+install build/bin/VTKJavaExecutable $RPM_BUILD_ROOT%{_bindir}
+install build/bin/vtkpython $RPM_BUILD_ROOT%{_bindir}
# Verdict places the docs in the false folder
-%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/vtk/doc
+#%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/vtk-6.0
%py_postclean
@@ -481,313 +438,96 @@ rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%post qt -p /sbin/ldconfig
-%postun qt -p /sbin/ldconfig
-
%post java -p /sbin/ldconfig
%postun java -p /sbin/ldconfig
%post python -p /sbin/ldconfig
%postun python -p /sbin/ldconfig
-%post python-qt -p /sbin/ldconfig
-%postun python-qt -p /sbin/ldconfig
-
%post tcl -p /sbin/ldconfig
%postun tcl -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
-%doc README.html vtkLogo.jpg vtkBanner.gif Wrapping/*/README*
+%doc README.html vtkLogo.jpg vtkBanner.gif Wrapping/Tools/README*
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf
%dir %{_libdir}/vtk
-%attr(755,root,root) %{_libdir}/vtk/libCosmo.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libCosmo.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libLSDyna.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libLSDyna.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libMapReduceMPI.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libMapReduceMPI.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libVPIC.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libVPIC.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libmpistubs.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libmpistubs.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkCharts.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkCharts.so.5.10
-%if %{with chemistry}
-%attr(755,root,root) %{_libdir}/vtk/libvtkChemistry.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkChemistry.so.5.10
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkCommon.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkCommon.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkDICOMParser.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkDICOMParser.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkFiltering.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkFiltering.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkGenericFiltering.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkGenericFiltering.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkGeovis.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkGeovis.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkGraphics.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkGraphics.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkHybrid.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkHybrid.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkIO.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkIO.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkImaging.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkImaging.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkInfovis.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkInfovis.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkNetCDF.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkNetCDF.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkNetCDF_cxx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkNetCDF_cxx.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkParallel.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkParallel.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkRendering.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkRendering.so.5.10
-%if %{with textanalysis}
-%attr(755,root,root) %{_libdir}/vtk/libvtkTextAnalysis.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkTextAnalysis.so.5.10
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkViews.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkViews.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkVolumeRendering.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkVolumeRendering.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkWidgets.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkWidgets.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkalglib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkalglib.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkexoIIc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkexoIIc.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkftgl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkftgl.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkmetaio.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkmetaio.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkproj4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkproj4.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtksqlite.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtksqlite.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtksys.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtksys.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkverdict.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkverdict.so.5.10
-%if %{with chemistry}
-%dir %{_datadir}/vtk-5.10
-%{_datadir}/vtk-5.10/vtkChemistry
-%endif
+%attr(755,root,root) %{_libdir}/vtk/libvtk*.so.1
+%exclude %{_libdir}/vtk/libvtk*Java.so.1
+%exclude %{_libdir}/vtk/libvtk*Python27D.so.1
+%exclude %{_libdir}/vtk/libvtkWrappingPython27Core.so.1
+%exclude %{_libdir}/vtk/libvtk*TCL.so.1
%files devel
%defattr(644,root,root,755)
%doc Utilities/Upgrading/*
%attr(755,root,root) %{_bindir}/lproj
%attr(755,root,root) %{_bindir}/vtkEncodeString
+%attr(755,root,root) %{_bindir}/vtkHashSource
+%attr(755,root,root) %{_bindir}/vtkParseOGLExt
+%attr(755,root,root) %{_bindir}/vtkProcessShader
%attr(755,root,root) %{_bindir}/vtkWrapHierarchy
-%attr(755,root,root) %{_libdir}/vtk/libCosmo.so
-%attr(755,root,root) %{_libdir}/vtk/libLSDyna.so
-%attr(755,root,root) %{_libdir}/vtk/libMapReduceMPI.so
-%attr(755,root,root) %{_libdir}/vtk/libVPIC.so
-%attr(755,root,root) %{_libdir}/vtk/libmpistubs.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkCharts.so
-%if %{with chemistry}
-%attr(755,root,root) %{_libdir}/vtk/libvtkChemistry.so
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkCommon.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkDICOMParser.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkFiltering.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkGenericFiltering.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkGeovis.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkGraphics.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkHybrid.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkIO.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkImaging.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkInfovis.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkNetCDF.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkNetCDF_cxx.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkParallel.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkRendering.so
-%if %{with textanalysis}
-%attr(755,root,root) %{_libdir}/vtk/libvtkTextAnalysis.so
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkViews.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkVolumeRendering.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkWidgets.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkalglib.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkexoIIc.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkftgl.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkmetaio.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkproj4.so
-%attr(755,root,root) %{_libdir}/vtk/libvtksqlite.so
-%attr(755,root,root) %{_libdir}/vtk/libvtksys.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkverdict.so
-%doc %{_libdir}/vtk/doxygen
-%{_libdir}/vtk/hints
+%attr(755,root,root) %{_libdir}/vtk/libvtkWrappingTools.a
+%attr(755,root,root) %{_libdir}/vtk/libvtk*.so
+%exclude %{_libdir}/vtk/libvtk*Java.so
+%exclude %{_libdir}/vtk/libvtk*Python27D.so
+%exclude %{_libdir}/vtk/libvtkWrappingPython27Core.so
+%exclude %{_libdir}/vtk/libvtk*TCL.so
%dir %{_includedir}/vtk
-%{_includedir}/vtk/Cosmo
-%{_includedir}/vtk/LSDyna
-%{_includedir}/vtk/VPIC
+%{_includedir}/vtk/DICOM*.h
+%{_includedir}/vtk/DatabaseSchemaWith2Tables.h
+%{_includedir}/vtk/JSONCPP
+%{_includedir}/vtk/LSDyna*.h
+%{_includedir}/vtk/Q*.h
%{_includedir}/vtk/alglib
-%{_includedir}/vtk/internal
-%{_includedir}/vtk/mrmpi
%{_includedir}/vtk/vtklibproj4
%{_includedir}/vtk/vtkmetaio
%{_includedir}/vtk/vtknetcdf
%{_includedir}/vtk/vtksqlite
-%{_includedir}/vtk/vtkstd
%{_includedir}/vtk/vtksys
-%{_includedir}/vtk/DICOM*.h
-%{_includedir}/vtk/verdict*.h
%{_includedir}/vtk/vtk*.h
%{_includedir}/vtk/vtk*.txx
-%exclude %{_includedir}/vtk/vtkEventQtSlotConnect.h
-%exclude %{_includedir}/vtk/vtkJava*.h
+%exclude %{_includedir}/vtk/vtkJavaUtil.h
+%exclude %{_includedir}/vtk/vtkWrappingJavaModule.h
%exclude %{_includedir}/vtk/vtkPython*.h
-%exclude %{_includedir}/vtk/vtkQImageToImageSource.h
-%exclude %{_includedir}/vtk/vtkQt*.h
%exclude %{_includedir}/vtk/vtkTcl*.h
%exclude %{_includedir}/vtk/vtkTk*.h
-%{_libdir}/vtk/CMake
-%{_libdir}/vtk/*.cmake
+%{_libdir}/cmake/vtk
%files qt
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/vtk/libQVTK.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libQVTK.so.5.10
%attr(755,root,root) %{_libdir}/qt4/plugins/designer/libQVTKWidgetPlugin.so
-%files qt-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/vtk/libQVTK.so
-%{_includedir}/vtk/QFilterTreeProxyModel.h
-%{_includedir}/vtk/QVTK*.h
-%{_includedir}/vtk/vtkEventQtSlotConnect.h
-%{_includedir}/vtk/vtkQImageToImageSource.h
-%{_includedir}/vtk/vtkQt*.h
-
%if %{with java}
%files java
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/VTKJavaExecutable
%attr(755,root,root) %{_bindir}/vtkParseJava
%attr(755,root,root) %{_bindir}/vtkWrapJava
-%attr(755,root,root) %{_libdir}/vtk/libvtkChartsJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkChartsJava.so.5.10
-%if %{with chemistry}
-%attr(755,root,root) %{_libdir}/vtk/libvtkChemistryJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkChemistryJava.so.5.10
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkCommonJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkCommonJava.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkFilteringJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkFilteringJava.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkGenericFilteringJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkGenericFilteringJava.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkGeovisJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkGeovisJava.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkGraphicsJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkGraphicsJava.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkHybridJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkHybridJava.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkIOJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkIOJava.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkImagingJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkImagingJava.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkInfovisJava.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkParallelJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkParallelJava.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkRenderingJava.so.5.10
-%if %{with textanalysis}
-%attr(755,root,root) %{_libdir}/vtk/libvtkTextAnalysisJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkTextAnalysisJava.so.5.10
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkViewsJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkViewsJava.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkVolumeRenderingJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkVolumeRenderingJava.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkWidgetsJava.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkWidgetsJava.so.5.10
-%{_libdir}/vtk/java
+%attr(755,root,root) %{_libdir}/vtk/libvtk*Java.so.1
+%{_libdir}/vtk/vtk.jar
%files java-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/vtk/libvtkChartsJava.so
-%if %{with chemistry}
-%attr(755,root,root) %{_libdir}/vtk/libvtkChemistryJava.so
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkCommonJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkFilteringJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkGenericFilteringJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkGeovisJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkGraphicsJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkHybridJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkIOJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkImagingJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkParallelJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingJava.so
-%if %{with textanalysis}
-%attr(755,root,root) %{_libdir}/vtk/libvtkTextAnalysisJava.so
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkViewsJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkVolumeRenderingJava.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkWidgetsJava.so
-%{_includedir}/vtk/vtkJava*.h
+%{_includedir}/vtk/vtkJavaUtil.h
+%{_includedir}/vtk/vtkWrappingJavaModule.h
+%attr(755,root,root) %{_libdir}/vtk/libvtk*Java.so
%endif
%files python
%defattr(644,root,root,755)
+%doc Wrapping/Python/README*
%attr(755,root,root) %{_bindir}/vtkWrapPython
%attr(755,root,root) %{_bindir}/vtkWrapPythonInit
%attr(755,root,root) %{_bindir}/vtkpython
-%attr(755,root,root) %{_libdir}/vtk/libvtkChartsPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkChartsPythonD.so.5.10
-%if %{with chemistry}
-%attr(755,root,root) %{_libdir}/vtk/libvtkChemistryPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkChemistryPythonD.so.5.10
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkCommonPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkCommonPythonD.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkFilteringPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkFilteringPythonD.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkGenericFilteringPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkGenericFilteringPythonD.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkGeovisPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkGeovisPythonD.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkGraphicsPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkGraphicsPythonD.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkHybridPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkHybridPythonD.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkIOPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkIOPythonD.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkImagingPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkImagingPythonD.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkInfovisPythonD.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkParallelPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkParallelPythonD.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkPythonCore.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkPythonCore.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkRenderingPythonD.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingPythonTkWidgets.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkRenderingPythonTkWidgets.so.5.10
-%if %{with textanalysis}
-%attr(755,root,root) %{_libdir}/vtk/libvtkTextAnalysisPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkTextAnalysisPythonD.so.5.10
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkViewsPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkViewsPythonD.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkVolumeRenderingPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkVolumeRenderingPythonD.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkWidgetsPythonD.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkWidgetsPythonD.so.5.10
+%attr(755,root,root) %{_libdir}/vtk/libvtk*Python27D.so.1
+%attr(755,root,root) %{_libdir}/vtk/libvtkWrappingPython27Core.so.1
%dir %{py_sitedir}/vtk
%{py_sitedir}/vtk/*.py[co]
%dir %{py_sitedir}/vtk/gtk
%{py_sitedir}/vtk/gtk/*.py[co]
-%dir %{py_sitedir}/vtk/qt
%dir %{py_sitedir}/vtk/qt4
-%{py_sitedir}/vtk/qt*/*.py[co]
+%{py_sitedir}/vtk/qt4/*.py[co]
%dir %{py_sitedir}/vtk/test
%{py_sitedir}/vtk/test/*.py[co]
%dir %{py_sitedir}/vtk/tk
@@ -796,179 +536,36 @@ rm -rf $RPM_BUILD_ROOT
%{py_sitedir}/vtk/util/*.py[co]
%dir %{py_sitedir}/vtk/wx
%{py_sitedir}/vtk/wx/*.py[co]
-%attr(755,root,root) %{py_sitedir}/vtk/vtkChartsPython.so
-%if %{with chemistry}
-%attr(755,root,root) %{py_sitedir}/vtk/vtkChemistryPython.so
-%endif
-%attr(755,root,root) %{py_sitedir}/vtk/vtkCommonPython.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkFilteringPython.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkGenericFilteringPython.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkGeovisPython.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkGraphicsPython.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkHybridPython.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkIOPython.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkImagingPython.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkInfovisPython.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkParallelPython.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkRenderingPython.so
-%if %{with textanalysis}
-%attr(755,root,root) %{py_sitedir}/vtk/vtkTextAnalysisPython.so
-%endif
-%attr(755,root,root) %{py_sitedir}/vtk/vtkViewsPython.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkVolumeRenderingPython.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkWidgetsPython.so
-%{py_sitedir}/VTK-%{version}-py*.egg-info
+%attr(755,root,root) %{py_sitedir}/vtk/vtk*Python.so
+%{py_sitedir}/VTK-*-py*.egg-info
%files python-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/vtk/libvtkChartsPythonD.so
-%if %{with chemistry}
-%attr(755,root,root) %{_libdir}/vtk/libvtkChemistryPythonD.so
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkCommonPythonD.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkFilteringPythonD.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkGenericFilteringPythonD.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkGeovisPythonD.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkGraphicsPythonD.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkHybridPythonD.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkIOPythonD.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkImagingPythonD.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisPythonD.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkParallelPythonD.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkPythonCore.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingPythonD.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingPythonTkWidgets.so
-%if %{with textanalysis}
-%attr(755,root,root) %{_libdir}/vtk/libvtkTextAnalysisPythonD.so
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkViewsPythonD.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkVolumeRenderingPythonD.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkWidgetsPythonD.so
+%attr(755,root,root) %{_libdir}/vtk/libvtk*Python27D.so
+%attr(755,root,root) %{_libdir}/vtk/libvtkWrappingPython27Core.so
%{_includedir}/vtk/PyVTK*.h
%{_includedir}/vtk/vtkPython*.h
-%if %{with sip}
-%files python-sip
-%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/vtk/vtkChartsPythonSIP.so
-%if %{with chemistry}
-%attr(755,root,root) %{py_sitedir}/vtk/vtkChemistryPythonSIP.so
-%endif
-%attr(755,root,root) %{py_sitedir}/vtk/vtkCommonPythonSIP.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkFilteringPythonSIP.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkGenericFilteringPythonSIP.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkGeovisPythonSIP.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkGraphicsPythonSIP.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkHybridPythonSIP.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkIOPythonSIP.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkImagingPythonSIP.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkInfovisPythonSIP.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkParallelPythonSIP.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkRenderingPythonSIP.so
-%if %{with textanalysis}
-%attr(755,root,root) %{py_sitedir}/vtk/vtkTextAnalysisPythonSIP.so
-%endif
-%attr(755,root,root) %{py_sitedir}/vtk/vtkViewsPythonSIP.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkVolumeRenderingPythonSIP.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkWidgetsPythonSIP.so
-
-%files python-qt
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/vtk/libvtkQtPythonD.so
-%attr(755,root,root) %{py_sitedir}/vtk/QVTKPython.so
-%attr(755,root,root) %{py_sitedir}/vtk/vtkQtPython.so
-%endif
-
%files tcl
%defattr(644,root,root,755)
-%doc README.html vtkLogo.jpg
+%doc Wrapping/Tcl/README*
%attr(755,root,root) %{_bindir}/vtkWrapTcl
%attr(755,root,root) %{_bindir}/vtkWrapTclInit
%attr(755,root,root) %{_bindir}/vtk
-%{_libdir}/vtk/tcl
-%{_libdir}/vtk/pkgIndex.tcl
-%attr(755,root,root) %{_libdir}/vtk/libvtkChartsTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkChartsTCL.so.5.10
-%if %{with chemistry}
-%attr(755,root,root) %{_libdir}/vtk/libvtkChemistryTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkChemistryTCL.so.5.10
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkCommonTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkCommonTCL.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkFilteringTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkFilteringTCL.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkGenericFilteringTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkGenericFilteringTCL.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkGeovisTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkGeovisTCL.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkGraphicsTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkGraphicsTCL.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkHybridTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkHybridTCL.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkIOTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkIOTCL.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkImagingTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkImagingTCL.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkInfovisTCL.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkParallelTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkParallelTCL.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkRenderingTCL.so.5.10
-%if %{with textanalysis}
-%attr(755,root,root) %{_libdir}/vtk/libvtkTextAnalysisTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkTextAnalysisTCL.so.5.10
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkViewsTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkViewsTCL.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkVolumeRenderingTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkVolumeRenderingTCL.so.5.10
-%attr(755,root,root) %{_libdir}/vtk/libvtkWidgetsTCL.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/vtk/libvtkWidgetsTCL.so.5.10
+%{_datadir}/tcl8.5/vtk
+%attr(755,root,root) %{_libdir}/vtk/libvtk*TCL.so.1
%files tcl-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/vtk/libvtkChartsTCL.so
-%if %{with chemistry}
-%attr(755,root,root) %{_libdir}/vtk/libvtkChemistryTCL.so
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkCommonTCL.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkFilteringTCL.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkGenericFilteringTCL.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkGeovisTCL.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkGraphicsTCL.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkHybridTCL.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkIOTCL.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkImagingTCL.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkInfovisTCL.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkParallelTCL.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkRenderingTCL.so
-%if %{with textanalysis}
-%attr(755,root,root) %{_libdir}/vtk/libvtkTextAnalysisTCL.so
-%endif
-%attr(755,root,root) %{_libdir}/vtk/libvtkViewsTCL.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkVolumeRenderingTCL.so
-%attr(755,root,root) %{_libdir}/vtk/libvtkWidgetsTCL.so
+%attr(755,root,root) %{_libdir}/vtk/libvtk*TCL.so
%{_includedir}/vtk/vtkTcl*.h
%{_includedir}/vtk/vtkTk*.h
%files test-suite
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/CommonCxxTests
-%attr(755,root,root) %{_bindir}/FilteringCxxTests
-%attr(755,root,root) %{_bindir}/GenericFilteringCxxTests
-%attr(755,root,root) %{_bindir}/GraphicsCxxTests
-%attr(755,root,root) %{_bindir}/IOCxxTests
-%attr(755,root,root) %{_bindir}/ImagingCxxTests
-%attr(755,root,root) %{_bindir}/RenderingCxxTests
-%attr(755,root,root) %{_bindir}/SocketClient
-%attr(755,root,root) %{_bindir}/SocketServer
-%attr(755,root,root) %{_bindir}/TestCxxFeatures
-%attr(755,root,root) %{_bindir}/TestInstantiator
+%attr(755,root,root) %{_bindir}/*Tests
+%attr(755,root,root) %{_bindir}/Test*
%attr(755,root,root) %{_bindir}/VTKBenchMark
-%attr(755,root,root) %{_bindir}/VolumeRenderingCxxTests
-%attr(755,root,root) %{_bindir}/WidgetsCxxTests
-%{_libdir}/vtk/testing
%files examples
%defattr(644,root,root,755)
@@ -992,6 +589,30 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/SGrid
%attr(755,root,root) %{_bindir}/SpecularSpheres
%attr(755,root,root) %{_bindir}/finance
+%attr(755,root,root) %{_bindir}/BalloonWidget
+%attr(755,root,root) %{_bindir}/BandedContours
+%attr(755,root,root) %{_bindir}/Delaunay3D
+%attr(755,root,root) %{_bindir}/Delaunay3DAlpha
+%attr(755,root,root) %{_bindir}/DumpXMLFile
+%attr(755,root,root) %{_bindir}/FilledContours
+%attr(755,root,root) %{_bindir}/FixedPointVolumeRayCastMapperCT
+%attr(755,root,root) %{_bindir}/GPURenderDemo
+%attr(755,root,root) %{_bindir}/Generate2DAMRDataSetWithPulse
+%attr(755,root,root) %{_bindir}/Generate3DAMRDataSetWithPulse
+%attr(755,root,root) %{_bindir}/GenerateCubesFromLabels
+%attr(755,root,root) %{_bindir}/GenerateModelsFromLabels
+%attr(755,root,root) %{_bindir}/ImageDataLIC2DDemo
+%attr(755,root,root) %{_bindir}/ImageSlicing
+%attr(755,root,root) %{_bindir}/LabeledMesh
+%attr(755,root,root) %{_bindir}/MaterialObjects
+%attr(755,root,root) %{_bindir}/ParticleReader
+%attr(755,root,root) %{_bindir}/Slider
+%attr(755,root,root) %{_bindir}/Slider2D
+%attr(755,root,root) %{_bindir}/StructuredGridLIC2DDemo
+%attr(755,root,root) %{_bindir}/SurfaceLICDemo
+%attr(755,root,root) %{_bindir}/TimeRenderer
+%attr(755,root,root) %{_bindir}/TimeRenderer2
+%attr(755,root,root) %{_bindir}/TubesWithVaryingRadiusAndColors
%{_examplesdir}/%{name}-%{version}
%files data
@@ -999,4 +620,5 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/vtk-data
%{_datadir}/vtk-data/Baseline
%{_datadir}/vtk-data/Data
+%{_datadir}/vtk-data/VERSION
%{_datadir}/vtk-data/VTKData.readme
diff --git a/vtk-chemistry.patch b/vtk-chemistry.patch
index 89ea85a..043c9a6 100644
--- a/vtk-chemistry.patch
+++ b/vtk-chemistry.patch
@@ -1,5 +1,5 @@
---- VTK5.10.1/Chemistry/vtkOpenQubeElectronicData.h.orig 2012-10-15 22:33:21.000000000 +0200
-+++ VTK5.10.1/Chemistry/vtkOpenQubeElectronicData.h 2012-12-25 07:56:14.818567966 +0100
+--- VTK5.10.1/Domains/Chemistry/vtkOpenQubeElectronicData.h.orig 2012-10-15 22:33:21.000000000 +0200
++++ VTK5.10.1/Domains/Chemistry/vtkOpenQubeElectronicData.h 2012-12-25 07:56:14.818567966 +0100
@@ -43,7 +43,7 @@
// Description:
@@ -9,8 +9,8 @@
// Description:
// Returns the vtkImageData for the requested molecular orbital. The data
---- VTK5.10.1/Chemistry/vtkOpenQubeElectronicData.cxx.orig 2012-10-15 22:33:21.000000000 +0200
-+++ VTK5.10.1/Chemistry/vtkOpenQubeElectronicData.cxx 2012-12-25 07:55:31.765235532 +0100
+--- VTK5.10.1/Domains/Chemistry/vtkOpenQubeElectronicData.cxx.orig 2012-10-15 22:33:21.000000000 +0200
++++ VTK5.10.1/Domains/Chemistry/vtkOpenQubeElectronicData.cxx 2012-12-25 07:55:31.765235532 +0100
@@ -164,7 +164,7 @@
}
diff --git a/vtk-ffmpeg.patch b/vtk-ffmpeg.patch
deleted file mode 100644
index 1588b3b..0000000
--- a/vtk-ffmpeg.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- VTK5.10.1/CMake/vtkTestFFMPEG.cmake.orig 2012-10-15 22:33:21.000000000 +0200
-+++ VTK5.10.1/CMake/vtkTestFFMPEG.cmake 2012-12-16 15:58:22.460839307 +0100
-@@ -1,10 +1,10 @@
- IF (FFMPEG_INCLUDE_DIR)
- IF("VTK_FFMPEG_HAS_OLD_HEADER" MATCHES "^VTK_FFMPEG_HAS_OLD_HEADER$" OR NOT "VTK_FFMPEG_CACHED_INCLUDE" MATCHES "^${FFMPEG_INCLUDE_DIR}$")
-- IF (EXISTS ${FFMPEG_INCLUDE_DIR}/ffmpeg)
-- SET(VTK_FFMPEG_HAS_OLD_HEADER "TRUE" CACHE INTERNAL "Is the FFMPEG include in the old location" FORCE)
-- ELSE (EXISTS ${FFMPEG_INCLUDE_DIR}/ffmpeg)
-- SET(VTK_FFMPEG_HAS_OLD_HEADER "FALSE" CACHE INTERNAL "Is the FFMPEG include in the old location" FORCE)
-- ENDIF (EXISTS ${FFMPEG_INCLUDE_DIR}/ffmpeg)
-+ IF (EXISTS ${FFMPEG_INCLUDE_DIR}/libavformat)
-+ SET(VTK_FFMPEG_HAS_OLD_HEADER "FALSE" CACHE INTERNAL "Is the FFMPEG include in the old location" FORCE)
-+ ELSE (EXISTS ${FFMPEG_INCLUDE_DIR}/libavformat)
-+ SET(VTK_FFMPEG_HAS_OLD_HEADER "TRUE" CACHE INTERNAL "Is the FFMPEG include in the old location" FORCE)
-+ ENDIF (EXISTS ${FFMPEG_INCLUDE_DIR}/libavformat)
- IF (VTK_FFMPEG_HAS_OLD_HEADER)
- MESSAGE(STATUS "Checking if FFMPEG uses old style header files - yes")
- ELSE (VTK_FFMPEG_HAS_OLD_HEADER)
---- VTK5.10.1/IO/vtkFFMPEGWriter.cxx.orig 2012-10-15 22:33:21.000000000 +0200
-+++ VTK5.10.1/IO/vtkFFMPEGWriter.cxx 2012-12-16 18:46:55.227295191 +0100
-@@ -123,7 +123,7 @@
- }
-
- //choose avi media file format
-- this->avOutputFormat = guess_format("avi", NULL, NULL);
-+ this->avOutputFormat = av_guess_format("avi", NULL, NULL);
- if (!this->avOutputFormat)
- {
- vtkGenericWarningMacro (<< "Could not open the avi media file format.");
-@@ -150,7 +150,7 @@
- //Set up the codec.
- AVCodecContext *c = this->avStream->codec;
- c->codec_id = (CodecID)this->avOutputFormat->video_codec;
-- c->codec_type = CODEC_TYPE_VIDEO;
-+ c->codec_type = AVMEDIA_TYPE_VIDEO;
- c->width = this->Dim[0];
- c->height = this->Dim[1];
- c->pix_fmt = PIX_FMT_YUVJ420P;
-@@ -192,13 +192,6 @@
- c->bit_rate_tolerance = this->Writer->GetBitRateTolerance();
- }
-
-- //apply the chosen parameters
-- if (av_set_parameters(this->avFormatContext, NULL) < 0)
-- {
-- vtkGenericWarningMacro (<< "Invalid output format parameters." );
-- return 0;
-- }
--
- //manufacture a codec with the chosen parameters
- AVCodec *codec = avcodec_find_encoder(c->codec_id);
- if (!codec)
-@@ -259,14 +252,14 @@
-
-
- //Finally, open the file and start it off.
-- if (url_fopen(&this->avFormatContext->pb, this->avFormatContext->filename, URL_WRONLY) < 0)
-+ if (avio_open(&this->avFormatContext->pb, this->avFormatContext->filename, AVIO_FLAG_WRITE) < 0)
- {
- vtkGenericWarningMacro (<< "Could not open " << this->Writer->GetFileName() << "." );
- return 0;
- }
- this->openedFile = 1;
-
-- av_write_header(this->avFormatContext);
-+ avformat_write_header(this->avFormatContext, NULL);
- return 1;
- }
-
-@@ -343,7 +336,7 @@
- pkt.stream_index = this->avStream->index;
- if (cc->coded_frame->key_frame) //treat keyframes well
- {
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- }
- pkt.duration = 0; //presentation duration in time_base units or 0 if NA
- pkt.pos = -1; //byte position in stream or -1 if NA
-@@ -391,7 +384,7 @@
- #ifdef VTK_FFMPEG_OLD_URL_FCLOSE
- url_fclose(&this->avFormatContext->pb);
- #else
-- url_fclose(this->avFormatContext->pb);
-+ avio_close(this->avFormatContext->pb);
- #endif
- this->openedFile = 0;
- }
diff --git a/vtk-install.patch b/vtk-install.patch
new file mode 100644
index 0000000..e455575
--- /dev/null
+++ b/vtk-install.patch
@@ -0,0 +1,15 @@
+diff -up VTK6.0.0/CMake/vtkModuleTop.cmake.install VTK6.0.0/CMake/vtkModuleTop.cmake
+--- VTK6.0.0/CMake/vtkModuleTop.cmake.install 2013-06-12 13:47:10.000000000 -0600
++++ VTK6.0.0/CMake/vtkModuleTop.cmake 2013-06-28 16:12:02.837198769 -0600
+@@ -330,9 +330,11 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT)
+ CMake/pythonmodules.h.in
+ CMake/UseVTK.cmake
+ CMake/FindTCL.cmake
++ CMake/TopologicalSort.cmake
+ CMake/vtkTclTkMacros.cmake
+ CMake/vtk-forward.c.in
+ CMake/vtkForwardingExecutable.cmake
++ CMake/vtkGroups.cmake
+ CMake/vtkJavaWrapping.cmake
+ CMake/vtkModuleAPI.cmake
+ CMake/vtkModuleHeaders.cmake.in
diff --git a/vtk-system-libs.patch b/vtk-system-libs.patch
index 5d44c35..5246ece 100644
--- a/vtk-system-libs.patch
+++ b/vtk-system-libs.patch
@@ -1,8 +1,22 @@
-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)
- ENDIF(CMAKE_CONFIGURATION_TYPES)
+diff --git a/CMake/vtkModuleMacros.cmake b/CMake/vtkModuleMacros.cmake
+index 3e746a6..9ef38fd 100644
+--- a/CMake/vtkModuleMacros.cmake
++++ b/CMake/vtkModuleMacros.cmake
+@@ -563,7 +563,7 @@ macro(vtk_module_third_party _pkg)
+ message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES")
+ endif()
+
+- option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF)
++ option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES})
+ mark_as_advanced(VTK_USE_SYSTEM_${_upper})
+
+ if(VTK_USE_SYSTEM_${_upper})
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d1dda8..b3e1801 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -97,6 +97,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_INSTALL_INCLUDE_DIR})
+ set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen)
#-----------------------------------------------------------------------------
+# Do we try to use system libraries by default?
@@ -10,17 +24,6 @@ diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt
+MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES)
+
+#-----------------------------------------------------------------------------
- # 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
-@@ -1,6 +1,6 @@
- #-----------------------------------------------------------------------------
- MACRO(VTK_THIRD_PARTY_OPTION upper lower)
-- OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." OFF)
-+ OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." ${VTK_USE_SYSTEM_LIBRARIES})
- MARK_AS_ADVANCED(VTK_USE_SYSTEM_${upper})
- IF(VTK_USE_SYSTEM_${upper})
- IF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
+ # The third party macros are still used in one or two third party builds.
+ include(vtkThirdParty)
+
diff --git a/vtk-vtkNetCDF_cxx-soname.patch b/vtk-vtkNetCDF_cxx-soname.patch
deleted file mode 100644
index 812020f..0000000
--- a/vtk-vtkNetCDF_cxx-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up VTK/Utilities/vtknetcdf/CMakeLists.txt.soname VTK/Utilities/vtknetcdf/CMakeLists.txt
---- VTK/Utilities/vtknetcdf/CMakeLists.txt.soname 2012-05-12 05:59:27.000000000 -0600
-+++ VTK/Utilities/vtknetcdf/CMakeLists.txt 2012-05-24 11:49:32.069811561 -0600
-@@ -350,6 +350,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})
-+ SET_TARGET_PROPERTIES(vtkNetCDF_cxx PROPERTIES ${VTK_LIBRARY_PROPERTIES})
- ENDIF(VTK_LIBRARY_PROPERTIES)
-
- #-----------------------------------------------------------------------------
diff --git a/vtk-vtknetcdf-lm.patch b/vtk-vtknetcdf-lm.patch
deleted file mode 100644
index 83799d4..0000000
--- a/vtk-vtknetcdf-lm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- VTK/Utilities/vtknetcdf/CMakeLists.txt~ 2012-04-02 18:57:30.000000000 +0200
-+++ VTK/Utilities/vtknetcdf/CMakeLists.txt 2012-11-15 12:48:08.386680992 +0100
-@@ -343,6 +343,7 @@
- TARGET_LINK_LIBRARIES(vtkNetCDF ${VTK_HDF5_LIBRARIES})
- endif()
- ENDIF (NETCDF_ENABLE_NETCDF4)
-+TARGET_LINK_LIBRARIES(vtkNetCDF -lm)
-
- VTK_ADD_LIBRARY(vtkNetCDF_cxx ${netcdf_cxx_SOURCES})
- TARGET_LINK_LIBRARIES(vtkNetCDF_cxx vtkNetCDF)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vtk.git/commitdiff/ed317954b20d523ae8779acffad70cb581ed6ccc
More information about the pld-cvs-commit
mailing list