rpms/vtk
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 5.4.2, undo some breakage in recent specfiles.

Browse Source
This commit is contained in:
athimm 2009-07-23 05:28:21 +00:00
parent dba18a2727
commit 6714263947
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtk-5.2.1-pythondestdir.patch → vtk-5.2.0-pythondestdir.patch
View File

@ -5,7 +5,7 @@
# Create default python setup arguments if they are not set. # Create default python setup arguments if they are not set.
IF(NOT 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 "--prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
+ SET(VTK_PYTHON_SETUP_ARGS "-O1 --root=\"${DOLLAR}ENV{RPM_BUILD_ROOT}\"" + SET(VTK_PYTHON_SETUP_ARGS "--root=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.") CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.")
MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS) MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS)
ENDIF(NOT DEFINED VTK_PYTHON_SETUP_ARGS) ENDIF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)

19
vtk.spec
View File

@ -7,14 +7,14 @@
Summary: The Visualization Toolkit - A high level 3D visualization library Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk Name: vtk
Version: 5.4.2 Version: 5.4.2
Release: 31%{?dist} Release: 33%{?dist}
# This is a variant BSD license, a cross between BSD and ZLIB. # This is a variant BSD license, a cross between BSD and ZLIB.
# For all intents, it has the same rights and restrictions as BSD. # For all intents, it has the same rights and restrictions as BSD.
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
License: BSD License: BSD
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://www.vtk.org/files/release/5.4/%{name}-%{version}.tar.gz Source: http://www.vtk.org/files/release/5.4/%{name}-%{version}.tar.gz
Patch0: vtk-5.2.1-pythondestdir.patch Patch0: vtk-5.2.0-pythondestdir.patch
Patch1: vtk-5.2.0-gcc43.patch Patch1: vtk-5.2.0-gcc43.patch
URL: http://vtk.org/ URL: http://vtk.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@ -194,8 +194,8 @@ cmake_command="cmake . \
-DVTK_USE_QVTK=ON \ -DVTK_USE_QVTK=ON \
%if %{with qt4} %if %{with qt4}
-DDESIRED_QT_VERSION=4 \ -DDESIRED_QT_VERSION=4 \
-DQT_MOC_EXECUTABLE=%{_libdir}/qt4/bin/moc \ -DQT_MOC_EXECUTABLE=`pkg-config --variable=moc_location QtCore` \
-DVTK_INSTALL_QT_DIR=`qmake-qt4 -query QT_INSTALL_PREFIX`/plugins/designer \ -DVTK_INSTALL_QT_DIR=`qmake -query QT_INSTALL_PREFIX`/plugins/designer \
%else %else
-DDESIRED_QT_VERSION:STRING=3 \ -DDESIRED_QT_VERSION:STRING=3 \
-DVTK_INSTALL_QT_DIR=`qmake -query QT_INSTALL_PREFIX`/plugins/designer \ -DVTK_INSTALL_QT_DIR=`qmake -query QT_INSTALL_PREFIX`/plugins/designer \
@ -230,6 +230,7 @@ if [ "%{_lib}" != lib -a "`ls %{buildroot}%{_prefix}/lib/*`" != "" ]; then
mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_libdir}
mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}/ mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}/
fi fi
mv %{buildroot}%{_libdir}/vtk-5.4/lib*.so* %{buildroot}%{_libdir}/
# Gather list of non-python/tcl libraries # Gather list of non-python/tcl libraries
ls %{buildroot}%{_libdir}/*.so.* \ ls %{buildroot}%{_libdir}/*.so.* \
@ -237,8 +238,8 @@ ls %{buildroot}%{_libdir}/*.so.* \
# List of executable utilities # List of executable utilities
cat > utils.list << EOF cat > utils.list << EOF
vtkParseOGLExt
vtkEncodeString vtkEncodeString
lproj
EOF EOF
# List of executable examples # List of executable examples
@ -300,7 +301,6 @@ done
cat libs.list utils.list > main.list cat libs.list utils.list > main.list
# Make shared libs and scripts executable # Make shared libs and scripts executable
mv %{buildroot}%{_libdir}/vtk-5.4/lib*.so* %{buildroot}%{_libdir}/
chmod a+x %{buildroot}%{_libdir}/lib*.so.* chmod a+x %{buildroot}%{_libdir}/lib*.so.*
chmod a+x %{buildroot}%{_libdir}/vtk-5.4/doxygen/*.pl chmod a+x %{buildroot}%{_libdir}/vtk-5.4/doxygen/*.pl
chmod a+x %{buildroot}%{_libdir}/vtk-5.4/testing/*.{py,tcl} chmod a+x %{buildroot}%{_libdir}/vtk-5.4/testing/*.{py,tcl}
@ -315,9 +315,11 @@ find Utilities/Upgrading -type f | xargs chmod -x
# Add exec bits to shared libs ... # Add exec bits to shared libs ...
#chmod 0755 %{buildroot}%{_libdir}/vtk-5.4/CMake/*.so #chmod 0755 %{buildroot}%{_libdir}/vtk-5.4/CMake/*.so
# Set proper perms on python shared libs ...
chmod 0755 %{buildroot}%{_libdir}/python*/site-packages/vtk/*.so chmod 0755 %{buildroot}%{_libdir}/python*/site-packages/vtk/*.so
# Verdict places the docs in the false folder
rm -fr %{buildroot}%{_libdir}/vtk-5.4/doc
%check %check
#LD_LIBARARY_PATH=`pwd`/bin ctest -V #LD_LIBARARY_PATH=`pwd`/bin ctest -V
@ -400,9 +402,6 @@ rm -rf %{buildroot}
%doc vtk-examples-5.4/Examples %doc vtk-examples-5.4/Examples
%changelog %changelog
* Thu Jun 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.4.2-31
- Fix pythondestdir patch file name
* Sat Jun 6 2009 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.4.2-30 * Sat Jun 6 2009 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.4.2-30
- Update to 5.4.2. - Update to 5.4.2.