rpm/vtk
SHA256
1
0
Fork 0
forked from pool/vtk
Code Pull Requests Activity

Accepting request 220546 from home:badshah400:branches:science

Browse Source 
Update to version 6.1.0 with appropriate packaging changes.

OBS-URL: https://build.opensuse.org/request/show/220546
OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=46
This commit is contained in:
Dmitry Roshchin 2014-02-01 11:59:26 +00:00 committed by Git OBS Bridge
parent 4119d27b1f
commit 412a42290d
6 changed files with 62 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
VTK-6.1.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bd7df10a479606d529a8b71f466c44a2bdd11fd534c62ce0aa44fad91883fa34
size 27608882

3
vtk-6.0.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:426df543cffeacf21154dddcd2a6efbd91a586570a07a0db4c426d3e0acd10e4
size 24170173

10
vtk-install-missing-modules.patch
View File

@ -1,6 +1,7 @@
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
Index: VTK-6.1.0/CMake/vtkModuleTop.cmake
===================================================================
--- VTK-6.1.0.orig/CMake/vtkModuleTop.cmake
+++ VTK-6.1.0/CMake/vtkModuleTop.cmake
@@ -330,9 +330,11 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT)
CMake/pythonmodules.h.in
CMake/UseVTK.cmake
@ -11,6 +12,5 @@ diff -up VTK6.0.0/CMake/vtkModuleTop.cmake.install VTK6.0.0/CMake/vtkModuleTop.c
CMake/vtkForwardingExecutable.cmake
+ CMake/vtkGroups.cmake
CMake/vtkJavaWrapping.cmake
CMake/vtkMakeInstantiator.cmake
CMake/vtkModuleAPI.cmake
CMake/vtkModuleHeaders.cmake.in

6
vtk-system.patch
View File

@ -15,9 +15,9 @@ Index: VTK6.0.0/CMakeLists.txt
===================================================================
--- VTK6.0.0.orig/CMakeLists.txt
+++ VTK6.0.0/CMakeLists.txt
@@ -107,6 +107,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_I
set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen)
@@ -132,6 +132,11 @@ if (CMAKE_CROSSCOMPILING AND NOT COMPILE
endif()
#-----------------------------------------------------------------------------
+# Do we try to use system libraries by default?
+OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF)

36
vtk.changes
View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri Jan 24 20:44:24 UTC 2014 - badshah400@gmail.com
- Update to version 6.1.0:
+ See http://www.kitware.com/news/home/browse/502 for a list of
changes
- Rebase patches:
+ vtk-system.patch
+ vtk-install-missing-modules.patch
- Packaging changes:
+ Re-enable R bindings for 13.1 and above
+ Turn off building test modules for now as it leads to build
issues (DBUILD_TESTING:BOOL=OFF)
+ Turn off usage of system libraries for now
(DVTK_USE_SYSTEM_LIBRARIES:BOOL=OFF), as usage of system
libraries now introduces dependency on json-cpp which is not
available for openSUSE (yet)
+ Python modules are now installed by vtk's cmake script;
hence, pass system python dirs to cmake by using cmake
variable DVTK_INSTALL_PYTHON_MODULE_DIR instead of
DVTK_PYTHON_SETUP_ARGS used previously
+ vtkpython is now installed by cmake script automatically;
hence remove the manual copying to /usr/bin used earlier
+ Python libraries are now stripped automatically on install;
chrpath no longer needed on these
+ Python object files are now installed in
%python_sitearch
+ Skip examples no longer installed as a result of test modules
being turned off
+ Install new binaries (mkg3states) and bundled data files
(/usr/share/vtk-6.1)
+ Cleanup spec file:
- Remove support for EOL openSUSE versions (12.1 and earlier)
by dropping appropriate conditionals
- Fix minor formatting issues.
-------------------------------------------------------------------
Fri Jul 19 02:52:28 UTC 2013 - badshah400@gmail.com

89
vtk.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package vtk
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,9 +17,9 @@
Name: vtk
Version: 6.0.0
Version: 6.1.0
Release: 0
%define series 6.0
%define series 6.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
@ -27,18 +27,15 @@ Summary: The Visualization Toolkit - A high level 3D visualization librar
License: BSD-3-Clause
Group: Productivity/Scientific/Other
Url: http://vtk.org/
Source: http://www.vtk.org/files/release/%{series}/%{name}-%{version}.tar.gz
Source: http://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.gz
# PATCH-FIX-UPSTREAM vtk-system.patch badshah400@gmail.com -- Use system libraries, http://public.kitware.com/Bug/view.php?id=11823
Patch0: vtk-system.patch
# PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch badshah400@gmail.com -- Fix file containing DATE and TIME
Patch1: vtk-fix-file-contains-date-time.patch
# PATCH-FIX-UPSTREAM vtk-install-missing-modules.patch badshah400@gmail.com -- Install some cmake modules missed in upstream packaging (will be required if in future we can get paraview to use system installed vtk)
Patch2: vtk-install-missing-modules.patch
%if 0%{?suse_version} > 1210
BuildRequires: Mesa-libGL-devel
%else
BuildRequires: Mesa-devel
%endif
BuildRequires: R-base-devel
BuildRequires: boost-devel
BuildRequires: chrpath
BuildRequires: cmake
@ -46,25 +43,14 @@ BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
%if 0%{?suse_version} > 1210
BuildRequires: gl2ps-devel
%endif
BuildRequires: gnuplot
BuildRequires: graphviz
%if 0%{?suse_version} > 1210
BuildRequires: hdf5-devel
%endif
BuildRequires: java-devel
BuildRequires: libQtWebKit-devel
%if 0%{?suse_version} > 1210
BuildRequires: libX11-devel
BuildRequires: libXt-devel
%else
BuildRequires: xorg-x11-devel
%endif
%if 0%{?suse_version} <= 1230
BuildRequires: R-base-devel
%endif
BuildRequires: libexpat-devel
BuildRequires: libiodbc-devel
BuildRequires: libjpeg-devel
@ -98,23 +84,13 @@ volume rendering, LOD control).
Summary: VTK header files for building C++ code
Group: Development/Libraries/Other
Requires: %{name} = %{version}
%if 0%{?suse_version} >= 1130
Requires: %{name}-java = %{version}
%endif
Requires: %{name}-qt = %{version}
Requires: %{name}-tcl = %{version}
%if 0%{?suse_version} > 1210
Requires: Mesa-libGL-devel
%else
Requires: Mesa-devel
%endif
%if 0%{?suse_version} > 1210
Requires: R-base-devel
Requires: gl2ps-devel
Requires: hdf5-devel
%endif
%if 0%{?suse_version} <= 1230
Requires: R-base-devel
%endif
Requires: libexpat-devel
Requires: libjpeg-devel
Requires: libmysqlclient-devel
@ -124,9 +100,7 @@ Requires: libqt4-devel
Requires: libtheora-devel
Requires: libtiff-devel
Requires: python-%{name} = %{version}
%if 0%{?suse_version} >= 1130
Requires: python-%{name}-qt = %{version}
%endif
%description devel
VTK is an open-source software system for image processing, 3D
@ -138,7 +112,6 @@ volume rendering, LOD control).
This provides the VTK header files required to compile C++ programs that
use VTK to do 3D visualisation.
%if 0%{?suse_version} >= 1130
%package java
Summary: Java bindings for VTK
Group: Development/Libraries/Java
@ -152,7 +125,6 @@ decimation) and rendering techniques (e.g., hardware-accelerated
volume rendering, LOD control).
This package provides java bindings for VTK.
%endif
%package -n python-%{name}
Summary: Python bindings for VTK
@ -169,7 +141,6 @@ volume rendering, LOD control).
This package provides python bindings for VTK.
%if 0%{?suse_version} >=1130
%package -n python-%{name}-qt
Summary: Qt Python VTK widget
Group: System/Libraries
@ -187,7 +158,6 @@ decimation) and rendering techniques (e.g., hardware-accelerated
volume rendering, LOD control).
This package provides python-qt bindings for VTK.
%endif
%package qt
Summary: Qt VTK widget
@ -250,7 +220,7 @@ volume rendering, LOD control).
This package provides a few testing programs for VTK.
%prep
%setup -q -n VTK%{version}
%setup -q -n VTK-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
@ -269,7 +239,7 @@ cmake .. \
-DBUILD_DOCUMENTATION:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
-DBUILD_TESTING:BOOL=ON \
-DBUILD_TESTING:BOOL=OFF \
-DVTK_CUSTOM_LIBRARY_SUFFIX="" \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DSIP_INCLUDE_DIR:Path=%{py_incdir} \
@ -280,35 +250,25 @@ cmake .. \
-DVTK_INSTALL_QT_DIR:STRING=/%{qtdir}/plugins/designer \
-DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \
-DVTK_USE_RENDERING:BOOL=ON \
-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
-DVTK_USE_SYSTEM_LIBRARIES:BOOL=OFF \
-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \
%if 0%{?suse_version} <= 1230
-DVTK_USE_SYSTEM_GL2PS:BOOL=OFF \
%endif
%if 0%{?suse_version} <= 1210
-DVTK_USE_SYSTEM_HDF5:BOOL=OFF \
%endif
-DVTK_PYTHON_SETUP_ARGS="--prefix=%{_prefix} --root=%{buildroot}" \
-DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{py_ver}/site-packages \
-DVTK_WRAP_PYTHON:BOOL=ON \
%if 0%{?suse_version} >= 1130
-DVTK_WRAP_JAVA:BOOL=ON \
-DVTK_WRAP_PYTHON_SIP:BOOL=ON \
%else
-DVTK_WRAP_JAVA:BOOL=OFF \
-DVTK_WRAP_PYTHON_SIP:BOOL=OFF \
%endif
-DVTK_WRAP_TCL:BOOL=ON \
-DVTK_Group_Imaging:BOOL=ON \
-DVTK_Group_Qt:BOOL=ON \
-DModule_vtkTestingCore:BOOL=ON \
-DModule_vtkTestingRendering:BOOL=ON \
-DVTK_Group_Rendering:BOOL=ON \
-DVTK_Group_StandAlone:BOOL=ON \
-DVTK_Group_Tk:BOOL=ON \
-DVTK_Group_Views:BOOL=ON \
%if 0%{?suse_version} <= 1230
-DModule_vtkFiltersStatisticsGnuR:BOOL=ON \
%else
-DModule_vtkFiltersStatisticsGnuR:BOOL=OFF \
%endif
-DVTK_WRAP_TCL:BOOL=ON
make %{?_smp_mflags} VERBOSE=1
@ -325,9 +285,6 @@ pushd build
mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d
echo %{_libdir}/%{name} > %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
# http://vtk.org/Bug/view.php?id=14125
chrpath -d %{buildroot}%{python_sitelib}/%{name}/*.so
# Gather list of non-binding libraries
ls %{buildroot}%{_libdir}/%{name}/lib*.so.* | grep -Ev '(Java|QVTK|Qt|Python|TCL)' | sed -e's,^%{buildroot},,' > libs.list
@ -344,10 +301,8 @@ RGrid
SGrid
ImageDataLIC2DDemo
StructuredGridLIC2DDemo
ImageProcessingExamplesCxxTests
ImageSlicing
DumpXMLFile
IOExamplesCxxTests
ParticleReader
GenerateCubesFromLabels
GenerateModelsFromLabels
@ -355,15 +310,12 @@ Medical1
Medical2
Medical3
Medical4
MedicalExamplesCxxTests
Delaunay3D
Delaunay3DAlpha
ModellingExamplesCxxTests
finance
AmbientSpheres
Cylinder
DiffuseSpheres
MaterialObjects
SpecularSpheres
SurfaceLICDemo
Cone
@ -375,13 +327,11 @@ Cone6
BandedContours
FilledContours
TubesWithVaryingRadiusAndColors
VisualizationAlgorithmsExamplesCxxTests
FixedPointVolumeRayCastMapperCT
GPURenderDemo
BalloonWidget
Slider
Slider2D
WidgetsExamplesCxxTests
EOF
# Install examples
@ -390,9 +340,6 @@ for file in `cat examples.list`; do
done
perl -pi -e's,^,%{_bindir}/,' examples.list
# vtkpython does not get installed by script, install manually
cp -p bin/vtkpython %{buildroot}%{_bindir}/
# Remove rpaths from installed binaries
chrpath -d %{buildroot}%{_bindir}/*
@ -401,18 +348,14 @@ chrpath -d %{buildroot}%{_bindir}/*
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%if 0%{?suse_version} >= 1130
%post java -p /sbin/ldconfig
%postun java -p /sbin/ldconfig
%endif
%post -n python-%{name} -p /sbin/ldconfig
%postun -n python-%{name} -p /sbin/ldconfig
%if 0%{?suse_version} >=1130
%post -n python-%{name}-qt -p /sbin/ldconfig
%postun -n python-%{name}-qt -p /sbin/ldconfig
%endif
%post qt -p /sbin/ldconfig
%postun qt -p /sbin/ldconfig
@ -431,23 +374,22 @@ chrpath -d %{buildroot}%{_bindir}/*
%{_bindir}/%{name}EncodeString
%{_bindir}/%{name}HashSource
%{_bindir}/%{name}ParseOGLExt
%{_bindir}/%{name}ProcessShader
%{_bindir}/%{name}WrapHierarchy
%{_bindir}/%{name}mkg3states
%{_datadir}/doc/%{name}-%{series}/
%{_libdir}/%{name}/*.so
%{_libdir}/cmake/%{name}/
%{_libdir}/%{name}/libvtkWrappingTools.a
%{_includedir}/%{name}-%{series}/
%{_datadir}/tcl/vtk/vtktcl.c
%{_datadir}/%{name}-%{series}/
%if 0%{?suse_version} >= 1130
%files java
%defattr(-,root,root,-)
%{_bindir}/%{name}ParseJava
%{_bindir}/%{name}WrapJava
%{_libdir}/%{name}/%{name}.jar
%{_libdir}/%{name}/*Java.so.*
%endif
%files -n python-%{name}
%defattr(-,root,root,-)
@ -455,8 +397,7 @@ chrpath -d %{buildroot}%{_bindir}/*
%{_bindir}/%{name}WrapPython
%{_bindir}/%{name}WrapPythonInit
%{_libdir}/%{name}/*Python*.so.*
%{python_sitelib}/VTK-%{series}-py%{py_ver}.egg-info
%{python_sitelib}/%{name}/
%{python_sitearch}/%{name}/
%exclude %{_libdir}/%{name}/*QtPython27D.so.*
%files tcl