Update to 5.4.2.
This commit is contained in:
parent
b3f0a3780b
commit
4a8554ff5a
@ -1 +1 @@
|
||||
vtk-5.2.0.tar.gz
|
||||
vtk-5.4.2.tar.gz
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
eb8c3b463c027490164538b0fc3b35ad vtk-5.2.0.tar.gz
|
||||
c2c797091d4b2128d9a1bd32c4b78227 vtk-5.4.2.tar.gz
|
||||
|
93
vtk.spec
93
vtk.spec
@ -1,19 +1,19 @@
|
||||
%bcond_without OSMesa
|
||||
%bcond_with qt4
|
||||
%bcond_without qt4
|
||||
%bcond_without java
|
||||
|
||||
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
|
||||
Summary: The Visualization Toolkit - A high level 3D visualization library
|
||||
Name: vtk
|
||||
Version: 5.2.0
|
||||
Release: 26%{?dist}
|
||||
Version: 5.4.2
|
||||
Release: 30%{?dist}
|
||||
# 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
|
||||
License: BSD
|
||||
Group: System Environment/Libraries
|
||||
Source: http://www.vtk.org/files/release/5.2/%{name}-%{version}.tar.gz
|
||||
Source: http://www.vtk.org/files/release/5.4/%{name}-%{version}.tar.gz
|
||||
Patch0: vtk-5.2.0-pythondestdir.patch
|
||||
Patch1: vtk-5.2.0-gcc43.patch
|
||||
URL: http://vtk.org/
|
||||
@ -28,7 +28,7 @@ BuildRequires: tk-devel, tcl-devel
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: expat-devel, freetype-devel, libjpeg-devel, libpng-devel
|
||||
BuildRequires: libtiff-devel, zlib-devel
|
||||
BuildRequires: qt3-devel
|
||||
%{!?with_qt4:BuildRequires: qt3-devel}
|
||||
%{?with_qt4:BuildRequires: qt4-devel}
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: doxygen, graphviz
|
||||
@ -112,13 +112,12 @@ programming languages.
|
||||
grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \
|
||||
perl -pi -e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/vtkdata-%{version},g'
|
||||
|
||||
# Remove executable bits from sources
|
||||
find . -name \*.c -or -name \*.cxx -or -name \*.h | xargs chmod -x
|
||||
|
||||
# Save an unbuilt copy of the Example's sources for %doc
|
||||
mkdir vtk-examples-5.2
|
||||
cp -a Examples vtk-examples-5.2
|
||||
find vtk-examples-5.2 -type f | xargs chmod -R a-x
|
||||
mkdir vtk-examples-5.4
|
||||
cp -a Examples vtk-examples-5.4
|
||||
# Don't ship Win32 examples
|
||||
rm -rf vtk-examples-5.4/Examples/GUI/Win32
|
||||
find vtk-examples-5.4 -type f | xargs chmod -R a-x
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags} -D_UNICODE"
|
||||
@ -129,8 +128,34 @@ export JAVA_HOME=/usr/lib/jvm/java
|
||||
%if %{with qt4}
|
||||
unset QTINC QTLIB QTPATH_LRELEASE QMAKESPEC
|
||||
export QTDIR=%{_libdir}/qt4
|
||||
qt_prefix=`pkg-config --variable=exec_prefix QtCore` || :
|
||||
if [ "$qt_prefix" = "" ]; then
|
||||
qt_prefix=`ls -d %{_libdir}/qt4* 2>/dev/null | tail -n 1`
|
||||
fi
|
||||
|
||||
if ! echo ${PATH} | /bin/grep -q $qt_prefix/bin ; then
|
||||
PATH=$qt_prefix/bin:${PATH}
|
||||
fi
|
||||
%else
|
||||
qt_prefix=`/usr/bin/pkg-config --variable=prefix qt-mt` || :
|
||||
if [ "$qt_prefix" = "" ]; then
|
||||
qt_prefix=`ls -d %{_libdir}/qt-* 2>/dev/null | tail -n 1`
|
||||
fi
|
||||
|
||||
if ! echo ${PATH} | /bin/grep -q $qt_prefix/bin ; then
|
||||
PATH=$qt_prefix/bin:${PATH}
|
||||
fi
|
||||
|
||||
if [ -n "$qt_prefix" -a -z "$QTDIR" ] ; then
|
||||
QTDIR="$qt_prefix"
|
||||
QTINC="$qt_prefix/include"
|
||||
QTLIB="$qt_prefix/lib"
|
||||
fi
|
||||
|
||||
export QTDIR QTINC QTLIB PATH
|
||||
%endif
|
||||
|
||||
# Not every subbuild respects build != install
|
||||
tmpinstall=`pwd`/tmpinstall
|
||||
|
||||
cmake_command="cmake . \
|
||||
@ -139,10 +164,9 @@ cmake_command="cmake . \
|
||||
-DBUILD_EXAMPLES:BOOL=ON \
|
||||
-DBUILD_TESTING:BOOL=ON \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=$tmpinstall \
|
||||
-DDESIRED_QT_VERSION:STRING=3 \
|
||||
-DVTK_INSTALL_BIN_DIR:PATH=%{_bindir} \
|
||||
-DVTK_INSTALL_INCLUDE_DIR:PATH=%{_includedir}/vtk \
|
||||
-DVTK_INSTALL_LIB_DIR:PATH=%{_libdir}/vtk-5.2 \
|
||||
-DVTK_INSTALL_LIB_DIR:PATH=%{_libdir}/vtk-5.4 \
|
||||
-DVTK_DATA_ROOT:PATH=%{_datadir}/vtkdata-%{version} \
|
||||
-DTK_INTERNAL_PATH:PATH=/usr/include/tk-private/generic \
|
||||
%if %{with OSMesa}
|
||||
@ -173,6 +197,7 @@ cmake_command="cmake . \
|
||||
-DQT_MOC_EXECUTABLE=%{_libdir}/qt4/bin/moc \
|
||||
-DVTK_INSTALL_QT_DIR=`qmake-qt4 -query QT_INSTALL_PREFIX`/plugins/designer \
|
||||
%else
|
||||
-DDESIRED_QT_VERSION:STRING=3 \
|
||||
-DVTK_INSTALL_QT_DIR=`qmake -query QT_INSTALL_PREFIX`/plugins/designer \
|
||||
%endif
|
||||
"
|
||||
@ -191,6 +216,10 @@ eval $cmake_command
|
||||
|
||||
make
|
||||
|
||||
# Remove executable bits from sources (some of which are generated)
|
||||
find . -name \*.c -or -name \*.cxx -or -name \*.h -or -name \*.hxx -or \
|
||||
-name \*.gif | xargs chmod -x
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
mkdir -p %{buildroot}
|
||||
@ -271,10 +300,10 @@ done
|
||||
cat libs.list utils.list > main.list
|
||||
|
||||
# Make shared libs and scripts executable
|
||||
mv %{buildroot}%{_libdir}/vtk-5.2/lib*.so* %{buildroot}%{_libdir}/
|
||||
mv %{buildroot}%{_libdir}/vtk-5.4/lib*.so* %{buildroot}%{_libdir}/
|
||||
chmod a+x %{buildroot}%{_libdir}/lib*.so.*
|
||||
chmod a+x %{buildroot}%{_libdir}/vtk-5.2/doxygen/*.pl
|
||||
chmod a+x %{buildroot}%{_libdir}/vtk-5.2/testing/*.{py,tcl}
|
||||
chmod a+x %{buildroot}%{_libdir}/vtk-5.4/doxygen/*.pl
|
||||
chmod a+x %{buildroot}%{_libdir}/vtk-5.4/testing/*.{py,tcl}
|
||||
|
||||
# Remove exec bit from non-scripts and %%doc
|
||||
for file in `find %{buildroot} -type f -perm 0755 \
|
||||
@ -285,7 +314,9 @@ done
|
||||
find Utilities/Upgrading -type f | xargs chmod -x
|
||||
|
||||
# Add exec bits to shared libs ...
|
||||
chmod 0755 %{buildroot}%{_libdir}/vtk-5.2/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
|
||||
|
||||
%check
|
||||
#LD_LIBARARY_PATH=`pwd`/bin ctest -V
|
||||
@ -322,12 +353,12 @@ rm -rf %{buildroot}
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc Utilities/Upgrading
|
||||
%{_libdir}/vtk-5.2/doxygen
|
||||
%{_libdir}/vtk-5.4/doxygen
|
||||
%{_includedir}/vtk
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/vtk-5.2/CMake
|
||||
%{_libdir}/vtk-5.2/*.cmake
|
||||
%{_libdir}/vtk-5.2/hints
|
||||
%{_libdir}/vtk-5.4/CMake
|
||||
%{_libdir}/vtk-5.4/*.cmake
|
||||
%{_libdir}/vtk-5.4/hints
|
||||
|
||||
%files tcl
|
||||
%defattr(-,root,root,-)
|
||||
@ -335,8 +366,8 @@ rm -rf %{buildroot}
|
||||
%{_bindir}/vtk
|
||||
%{_bindir}/vtkWrapTcl
|
||||
%{_bindir}/vtkWrapTclInit
|
||||
%{_libdir}/vtk-5.2/pkgIndex.tcl
|
||||
%{_libdir}/vtk-5.2/tcl
|
||||
%{_libdir}/vtk-5.4/pkgIndex.tcl
|
||||
%{_libdir}/vtk-5.4/tcl
|
||||
|
||||
%files python
|
||||
%defattr(-,root,root,-)
|
||||
@ -358,17 +389,27 @@ rm -rf %{buildroot}
|
||||
%files qt
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libQVTK.so.*
|
||||
%{_libdir}/qt*/plugins/designer/libQVTKWidgetPlugin.so
|
||||
%{_libdir}/qt*/plugins/designer
|
||||
|
||||
%files testing -f testing.list
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/vtk-5.2/testing
|
||||
%{_libdir}/vtk-5.4/testing
|
||||
|
||||
%files examples -f examples.list
|
||||
%defattr(-,root,root,-)
|
||||
%doc vtk-examples-5.2/Examples
|
||||
%doc vtk-examples-5.4/Examples
|
||||
|
||||
%changelog
|
||||
* Sat Jun 6 2009 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.4.2-30
|
||||
- Update to 5.4.2.
|
||||
|
||||
* Thu Mar 12 2009 Orion Poplawski <orion@cora.nwra.com> - 5.2.1-29
|
||||
- Update to 5.2.1
|
||||
|
||||
* Fri Mar 06 2009 Jesse Keating <jkeating@redhat.com> - 5.2.0-28
|
||||
- Remove chmod on examples .so files, none are built. This needs
|
||||
more attention.
|
||||
|
||||
* Sun Oct 5 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.2.0-26
|
||||
- Update to 5.2.0.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user