diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 9abde8c..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -vtk-5.0.4.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..115e8c4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +vtk-5.4.2.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 42e614e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vtk -# $Id$ -NAME := vtk -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index 1281a7a..7c056c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1e353886bbd6559633e31436d88a1f03 vtk-5.0.4.tar.gz +c2c797091d4b2128d9a1bd32c4b78227 vtk-5.4.2.tar.gz diff --git a/vtk-5.0.4-gcc43.patch b/vtk-5.0.4-gcc43.patch deleted file mode 100644 index 74379d6..0000000 --- a/vtk-5.0.4-gcc43.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- VTK-5.0.4/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43 2007-05-03 11:12:13.000000000 -0600 -+++ VTK-5.0.4/Utilities/DICOMParser/DICOMAppHelper.cxx 2008-04-11 13:52:05.000000000 -0600 -@@ -31,7 +31,7 @@ - - #include - #include --#include -+#include - #include - #include - #if defined(__BORLANDC__) ---- VTK/Utilities/DICOMParser/DICOMFile.cxx.gcc43 2005-07-26 14:02:22.000000000 -0600 -+++ VTK/Utilities/DICOMParser/DICOMFile.cxx 2008-10-01 10:08:33.000000000 -0600 -@@ -23,7 +23,7 @@ - #endif - - #include --#include -+#include - - #include "DICOMConfig.h" - #include "DICOMFile.h" ---- VTK/Utilities/DICOMParser/DICOMParser.cxx.gcc43 2006-03-24 08:59:50.000000000 -0700 -+++ VTK/Utilities/DICOMParser/DICOMParser.cxx 2008-10-01 10:08:33.000000000 -0600 -@@ -36,7 +36,7 @@ - #include - #endif - --#include -+#include - - #include "DICOMConfig.h" - #include "DICOMParser.h" diff --git a/vtk-5.2.0-gcc43.patch b/vtk-5.2.0-gcc43.patch new file mode 100644 index 0000000..5f9a0b4 --- /dev/null +++ b/vtk-5.2.0-gcc43.patch @@ -0,0 +1,33 @@ +--- VTK/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43 2008-03-19 21:22:17.000000000 +0100 ++++ VTK/Utilities/DICOMParser/DICOMAppHelper.cxx 2008-10-05 11:46:08.000000000 +0200 +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #if defined(__BORLANDC__) +--- VTK/Utilities/DICOMParser/DICOMFile.cxx.gcc43 2008-03-19 21:22:17.000000000 +0100 ++++ VTK/Utilities/DICOMParser/DICOMFile.cxx 2008-10-05 11:46:02.000000000 +0200 +@@ -27,7 +27,7 @@ + + #include + #include +-#include ++#include + + DICOMFile::DICOMFile() : InputStream() + { +--- VTK/Utilities/DICOMParser/DICOMParser.cxx.gcc43 2008-07-21 19:03:03.000000000 +0200 ++++ VTK/Utilities/DICOMParser/DICOMParser.cxx 2008-10-05 11:45:56.000000000 +0200 +@@ -40,7 +40,7 @@ + #endif + + #include +-#include ++#include + + // Define DEBUG_DICOM to get debug messages sent to dicom_stream::cerr + // #define DEBUG_DICOM diff --git a/vtk-5.0.0-pythondestdir.patch b/vtk-5.2.0-pythondestdir.patch similarity index 54% rename from vtk-5.0.0-pythondestdir.patch rename to vtk-5.2.0-pythondestdir.patch index c24f65a..3668d55 100644 --- a/vtk-5.0.0-pythondestdir.patch +++ b/vtk-5.2.0-pythondestdir.patch @@ -1,11 +1,11 @@ ---- VTK/Wrapping/Python/CMakeLists.txt~ 2005-08-25 21:31:14.000000000 +0200 -+++ VTK/Wrapping/Python/CMakeLists.txt 2006-05-27 13:32:40.000000000 +0200 -@@ -299,7 +299,7 @@ +--- VTK/Wrapping/Python/CMakeLists.txt.pythondestdir 2008-05-03 21:34:42.000000000 +0200 ++++ VTK/Wrapping/Python/CMakeLists.txt 2008-10-05 11:15:44.000000000 +0200 +@@ -348,7 +348,7 @@ + # Create default python setup arguments if they are not set. - IF(DEFINED VTK_PYTHON_SETUP_ARGS) - ELSE(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 "--root=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\" -O1" ++ SET(VTK_PYTHON_SETUP_ARGS "--root=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\"" CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.") MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS) - ENDIF(DEFINED VTK_PYTHON_SETUP_ARGS) + ENDIF(NOT DEFINED VTK_PYTHON_SETUP_ARGS) diff --git a/vtk.spec b/vtk.spec index fd3a3bb..2d3b977 100644 --- a/vtk.spec +++ b/vtk.spec @@ -1,21 +1,21 @@ %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.0.4 -Release: 25%{?dist} +Version: 5.4.2 +Release: 33%{?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.0/%{name}-%{version}.tar.gz -Patch0: vtk-5.0.0-pythondestdir.patch -Patch1: vtk-5.0.4-gcc43.patch +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/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: cmake >= 2.0.4 @@ -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 @@ -104,7 +104,7 @@ programming languages. %prep %setup -q -n VTK -%patch0 -p1 +%patch0 -p1 -b .pythondestdir %patch1 -p1 -b .gcc43 # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version} @@ -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.0 -cp -a Examples vtk-examples-5.0 -find vtk-examples-5.0 -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 . \ @@ -141,7 +166,7 @@ cmake_command="cmake . \ -DCMAKE_INSTALL_PREFIX:PATH=$tmpinstall \ -DVTK_INSTALL_BIN_DIR:PATH=%{_bindir} \ -DVTK_INSTALL_INCLUDE_DIR:PATH=%{_includedir}/vtk \ - -DVTK_INSTALL_LIB_DIR:PATH=%{_libdir} \ + -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} @@ -169,9 +194,10 @@ cmake_command="cmake . \ -DVTK_USE_QVTK=ON \ %if %{with qt4} -DDESIRED_QT_VERSION=4 \ - -DQT_MOC_EXECUTABLE=%{_libdir}/qt4/bin/moc \ - -DVTK_INSTALL_QT_DIR=`qmake-qt4 -query QT_INSTALL_PREFIX`/plugins/designer \ + -DQT_MOC_EXECUTABLE=`pkg-config --variable=moc_location QtCore` \ + -DVTK_INSTALL_QT_DIR=`qmake -query QT_INSTALL_PREFIX`/plugins/designer \ %else + -DDESIRED_QT_VERSION:STRING=3 \ -DVTK_INSTALL_QT_DIR=`qmake -query QT_INSTALL_PREFIX`/plugins/designer \ %endif " @@ -190,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} @@ -200,18 +230,16 @@ if [ "%{_lib}" != lib -a "`ls %{buildroot}%{_prefix}/lib/*`" != "" ]; then mkdir -p %{buildroot}%{_libdir} mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}/ fi +mv %{buildroot}%{_libdir}/vtk-5.4/lib*.so* %{buildroot}%{_libdir}/ # Gather list of non-python/tcl libraries ls %{buildroot}%{_libdir}/*.so.* \ | grep -Ev '(Java|QVTK|PythonD|TCL)' | sed -e's,^%{buildroot},,' > libs.list -mkdir -p %{buildroot}%{_libdir}/vtk-examples-5.0 \ - %{buildroot}%{_libdir}/vtk-testing-5.0 - # List of executable utilities cat > utils.list << EOF -vtkParseOGLExt -vtkVREncodeString +vtkEncodeString +lproj EOF # List of executable examples @@ -274,8 +302,8 @@ cat libs.list utils.list > main.list # Make shared libs and scripts executable chmod a+x %{buildroot}%{_libdir}/lib*.so.* -chmod a+x %{buildroot}%{_libdir}/vtk-5.0/doxygen/*.pl -chmod a+x %{buildroot}%{_libdir}/vtk-5.0/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 \ @@ -286,7 +314,11 @@ done find Utilities/Upgrading -type f | xargs chmod -x # Add exec bits to shared libs ... -chmod 0755 %{buildroot}%{_libdir}/vtk-5.0/CMake/*.so +#chmod 0755 %{buildroot}%{_libdir}/vtk-5.4/CMake/*.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 #LD_LIBARARY_PATH=`pwd`/bin ctest -V @@ -323,12 +355,12 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root,-) %doc Utilities/Upgrading -%{_libdir}/vtk-5.0/doxygen +%{_libdir}/vtk-5.4/doxygen %{_includedir}/vtk %{_libdir}/*.so -%{_libdir}/vtk-5.0/CMake -%{_libdir}/vtk-5.0/*.cmake -%{_libdir}/vtk-5.0/hints +%{_libdir}/vtk-5.4/CMake +%{_libdir}/vtk-5.4/*.cmake +%{_libdir}/vtk-5.4/hints %files tcl %defattr(-,root,root,-) @@ -336,8 +368,8 @@ rm -rf %{buildroot} %{_bindir}/vtk %{_bindir}/vtkWrapTcl %{_bindir}/vtkWrapTclInit -%{_libdir}/vtk-5.0/pkgIndex.tcl -%{_libdir}/vtk-5.0/tcl +%{_libdir}/vtk-5.4/pkgIndex.tcl +%{_libdir}/vtk-5.4/tcl %files python %defattr(-,root,root,-) @@ -359,19 +391,30 @@ 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.0/testing -%{_libdir}/vtk-testing-5.0 +%{_libdir}/vtk-5.4/testing %files examples -f examples.list %defattr(-,root,root,-) -%doc vtk-examples-5.0/Examples -%{_libdir}/vtk-examples-5.0 +%doc vtk-examples-5.4/Examples %changelog +* Sat Jun 6 2009 Axel Thimm - 5.4.2-30 +- Update to 5.4.2. + +* Thu Mar 12 2009 Orion Poplawski - 5.2.1-29 +- Update to 5.2.1 + +* Fri Mar 06 2009 Jesse Keating - 5.2.0-28 +- Remove chmod on examples .so files, none are built. This needs + more attention. + +* Sun Oct 5 2008 Axel Thimm - 5.2.0-26 +- Update to 5.2.0. + * Wed Oct 1 2008 Orion Poplawski - 5.0.2-25 - Fix patch fuzz