diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index a7f176e..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -vtk-5.0.3.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..de3cd17 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +vtk-5.2.0.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 b62a147..9df2052 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0148a3d3c46d0599ab63e79f7f406609 vtk-5.0.3.tar.gz +eb8c3b463c027490164538b0fc3b35ad vtk-5.2.0.tar.gz diff --git a/vtk-5.0.0-pythondestdir.patch b/vtk-5.0.0-pythondestdir.patch deleted file mode 100644 index c24f65a..0000000 --- a/vtk-5.0.0-pythondestdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 @@ - # Create default python setup arguments if they are not set. - IF(DEFINED VTK_PYTHON_SETUP_ARGS) - ELSE(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" - CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.") - MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS) - ENDIF(DEFINED VTK_PYTHON_SETUP_ARGS) diff --git a/vtk.spec b/vtk.spec index 1c362e2..6f98642 100644 --- a/vtk.spec +++ b/vtk.spec @@ -1,22 +1,26 @@ %bcond_without OSMesa %bcond_with qt4 -%bcond_with java +%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.3 -Release: 20%{?dist} -License: BSD-like +Version: 5.2.0 +Release: 26%{?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 +Source: http://www.vtk.org/files/release/5.2/%{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 BuildRequires: gcc-c++ -%{?with_java:BuildRequires: java-devel} +%{?with_java:BuildRequires: gcc-java, libgcj-devel} BuildRequires: libX11-devel, libXt-devel, libXext-devel BuildRequires: libICE-devel, libGL-devel %{?with_OSMesa:BuildRequires: mesa-libOSMesa-devel} @@ -24,9 +28,10 @@ BuildRequires: tk-devel, tcl-devel BuildRequires: python-devel BuildRequires: expat-devel, freetype-devel, libjpeg-devel, libpng-devel BuildRequires: libtiff-devel, zlib-devel -BuildRequires: qt-devel +BuildRequires: qt3-devel %{?with_qt4:BuildRequires: qt4-devel} BuildRequires: chrpath +BuildRequires: doxygen, graphviz %description VTK is an open-source software system for image processing, 3D @@ -99,7 +104,8 @@ 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} # otherwise it will break on symlinks. @@ -110,9 +116,9 @@ grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \ 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.2 +cp -a Examples vtk-examples-5.2 +find vtk-examples-5.2 -type f | xargs chmod -R a-x %build export CFLAGS="%{optflags} -D_UNICODE" @@ -133,10 +139,12 @@ 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} \ + -DVTK_INSTALL_LIB_DIR:PATH=%{_libdir}/vtk-5.2 \ -DVTK_DATA_ROOT:PATH=%{_datadir}/vtkdata-%{version} \ + -DTK_INTERNAL_PATH:PATH=/usr/include/tk-private/generic \ %if %{with OSMesa} -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ %endif @@ -198,13 +206,10 @@ fi 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 EOF # List of executable examples @@ -266,9 +271,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}/ 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.2/doxygen/*.pl +chmod a+x %{buildroot}%{_libdir}/vtk-5.2/testing/*.{py,tcl} # Remove exec bit from non-scripts and %%doc for file in `find %{buildroot} -type f -perm 0755 \ @@ -279,9 +285,9 @@ 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.2/CMake/*.so -%check || : +%check #LD_LIBARARY_PATH=`pwd`/bin ctest -V %clean @@ -316,12 +322,12 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root,-) %doc Utilities/Upgrading -%{_libdir}/vtk-5.0/doxygen +%{_libdir}/vtk-5.2/doxygen %{_includedir}/vtk %{_libdir}/*.so -%{_libdir}/vtk-5.0/CMake -%{_libdir}/vtk-5.0/*.cmake -%{_libdir}/vtk-5.0/hints +%{_libdir}/vtk-5.2/CMake +%{_libdir}/vtk-5.2/*.cmake +%{_libdir}/vtk-5.2/hints %files tcl %defattr(-,root,root,-) @@ -329,12 +335,13 @@ rm -rf %{buildroot} %{_bindir}/vtk %{_bindir}/vtkWrapTcl %{_bindir}/vtkWrapTclInit -%{_libdir}/vtk-5.0/pkgIndex.tcl -%{_libdir}/vtk-5.0/tcl +%{_libdir}/vtk-5.2/pkgIndex.tcl +%{_libdir}/vtk-5.2/tcl %files python %defattr(-,root,root,-) -%{python_sitearch}/vtk +#%{python_sitearch}/vtk +%{python_sitearch}/* %{_libdir}/*PythonD.so.* %{_bindir}/vtkpython %{_bindir}/vtkWrapPython @@ -355,17 +362,37 @@ rm -rf %{buildroot} %files testing -f testing.list %defattr(-,root,root,-) -%{_libdir}/vtk-5.0/testing -%{_libdir}/vtk-testing-5.0 +%{_libdir}/vtk-5.2/testing %files examples -f examples.list %defattr(-,root,root,-) -%doc vtk-examples-5.0/Examples -%{_libdir}/vtk-examples-5.0 +%doc vtk-examples-5.2/Examples %changelog -* Tue Aug 28 2007 Fedora Release Engineering - 5.0.3-20 -- Rebuild for selinux ppc32 issue. +* 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 + +* Mon Aug 25 2008 Axel Thimm - 5.0.4-24 +- Change java build dependencies from java-devel to gcj. + +* Sun Aug 24 2008 Axel Thimm - 5.0.4-23 +- %%check || : does not work anymore. +- enable java by default. + +* Wed May 21 2008 Tom "spot" Callaway - 5.0.4-22 +- fix license tag + +* Sat Apr 12 2008 Axel Thimm - 5.0.4-21 +- Fixes for gcc 4.3 by Orion Poplawski. + +* Sat Apr 5 2008 Axel Thimm - 5.0.4-20 +- Change BR to qt-devel to qt3-devel. + +* Sat Feb 23 2008 Axel Thimm - 5.0.4-19 +- Update to 5.0.4. * Mon May 28 2007 Axel Thimm - 5.0.3-18 - Move headers to %%{_includedir}/vtk.