rpms/vtk/F-10 vtk-5.2.0-gcc43.patch, NONE, 1.1 vtk-5.2.0-pythondestdir.patch, NONE, 1.1 vtk.spec, 1.15, 1.16

[athimm]

Author: athimm

Update of /cvs/extras/rpms/vtk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25778/F-10

Modified Files:
	vtk.spec 
Added Files:
	vtk-5.2.0-gcc43.patch vtk-5.2.0-pythondestdir.patch 
Log Message:
Update to 5.4.2, undo some breakage in recent specfiles.

vtk-5.2.0-gcc43.patch:
 DICOMAppHelper.cxx |    2 +-
 DICOMFile.cxx      |    2 +-
 DICOMParser.cxx    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- 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:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 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: vtk.spec
===================================================================
RCS file: /cvs/extras/rpms/vtk/F-10/vtk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- vtk.spec	8 Jun 2009 06:04:08 -0000	1.15
+++ vtk.spec	23 Jul 2009 05:28:20 -0000	1.16
@@ -7,7 +7,7 @@
 Summary: The Visualization Toolkit - A high level 3D visualization library
 Name: vtk
 Version: 5.4.2
-Release: 30%{?dist}
+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
@@ -194,8 +194,8 @@ 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 \
@@ -230,6 +230,7 @@ if [ "%{_lib}" != lib -a "`ls %{buildroo
   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.* \
@@ -237,8 +238,8 @@ ls %{buildroot}%{_libdir}/*.so.* \
 
 # List of executable utilities
 cat > utils.list << EOF
-vtkParseOGLExt
 vtkEncodeString
+lproj
 EOF
 
 # List of executable examples
@@ -300,7 +301,6 @@ done
 cat libs.list utils.list > main.list
 
 # 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}/vtk-5.4/doxygen/*.pl
 chmod a+x %{buildroot}%{_libdir}/vtk-5.4/testing/*.{py,tcl}
@@ -315,9 +315,11 @@ find Utilities/Upgrading -type f | xargs
 
 # Add exec bits to shared libs ...
 #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
 
+# Verdict places the docs in the false folder
+rm -fr %{buildroot}%{_libdir}/vtk-5.4/doc
+
 %check
 #LD_LIBARARY_PATH=`pwd`/bin ctest -V