rpms/vtk/devel vtk-5.2.0-gcc43.patch, NONE, 1.1 vtk-5.2.0-pythondestdir.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 vtk.spec, 1.14, 1.15 vtk-5.0.0-pythondestdir.patch, 1.1, NONE vtk-5.0.4-gcc43.patch, 1.2, NONE

[Axel Thimm]

Author: athimm

Update of /cvs/extras/rpms/vtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4495/devel

Modified Files:
	.cvsignore sources vtk.spec 
Added Files:
	vtk-5.2.0-gcc43.patch vtk-5.2.0-pythondestdir.patch 
Removed Files:
	vtk-5.0.0-pythondestdir.patch vtk-5.0.4-gcc43.patch 
Log Message:
Update to 5.2.0

vtk-5.2.0-gcc43.patch:

--- NEW FILE vtk-5.2.0-gcc43.patch ---
--- 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 <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <string>
+#include <cstring>
 #include <math.h>
 #include <algorithm>
 #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 <stdio.h>
 #include <string.h>
-#include <string>
+#include <cstring>
 
 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 <string.h>
-#include <string>
+#include <cstring>
 
 // Define DEBUG_DICOM to get debug messages sent to dicom_stream::cerr
 // #define DEBUG_DICOM

vtk-5.2.0-pythondestdir.patch:

--- NEW FILE vtk-5.2.0-pythondestdir.patch ---
--- 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(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}\""
         CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.")
       MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS)
     ENDIF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vtk/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Feb 2008 11:45:49 -0000	1.3
+++ .cvsignore	21 Dec 2008 21:58:48 -0000	1.4
@@ -1 +1 @@
-vtk-5.0.4.tar.gz
+vtk-5.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vtk/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Feb 2008 11:45:49 -0000	1.3
+++ sources	21 Dec 2008 21:58:48 -0000	1.4
@@ -1 +1 @@
-1e353886bbd6559633e31436d88a1f03  vtk-5.0.4.tar.gz
+eb8c3b463c027490164538b0fc3b35ad  vtk-5.2.0.tar.gz


Index: vtk.spec
===================================================================
RCS file: /cvs/extras/rpms/vtk/devel/vtk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vtk.spec	29 Nov 2008 17:35:09 -0000	1.14
+++ vtk.spec	21 Dec 2008 21:58:49 -0000	1.15
@@ -6,16 +6,16 @@
 
 Summary: The Visualization Toolkit - A high level 3D visualization library
 Name: vtk
-Version: 5.0.4
+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
-Patch1: vtk-5.0.4-gcc43.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
@@ -104,7 +104,7 @@
 
 %prep
 %setup -q -n VTK
-%patch0 -p1
+%patch0 -p1 -b .pythondestdir
 %patch1 -p1 -b .gcc43
 
 # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version}
@@ -116,9 +116,9 @@
 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"
@@ -139,9 +139,10 @@
  -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}
@@ -205,13 +206,10 @@
 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
@@ -273,9 +271,10 @@
 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 \
@@ -286,7 +285,7 @@
 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
 #LD_LIBARARY_PATH=`pwd`/bin ctest -V
@@ -323,12 +322,12 @@
 %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,-)
@@ -336,8 +335,8 @@
 %{_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,-)
@@ -363,17 +362,15 @@
 
 %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
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 5.0.4-26
-- Rebuild for Python 2.6
+* Sun Oct  5 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.2.0-26
+- Update to 5.2.0.
 
 * Wed Oct 1 2008 Orion Poplawski <orion at cora.nwra.com> - 5.0.2-25
 - Fix patch fuzz


--- vtk-5.0.0-pythondestdir.patch DELETED ---


--- vtk-5.0.4-gcc43.patch DELETED ---