rpms/vtk/devel vtk-5.0.4-gcc43.patch,1.1,1.2 vtk.spec,1.12,1.13

[Orion Poplawski]

Author: orion

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

Modified Files:
	vtk-5.0.4-gcc43.patch vtk.spec 
Log Message:
* Wed Oct 1 2008 Orion Poplawski <orion at cora.nwra.com> - 5.0.2-25
- Fix patch fuzz


vtk-5.0.4-gcc43.patch:

Index: vtk-5.0.4-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vtk/devel/vtk-5.0.4-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vtk-5.0.4-gcc43.patch	12 Apr 2008 05:42:05 -0000	1.1
+++ vtk-5.0.4-gcc43.patch	1 Oct 2008 16:12:49 -0000	1.2
@@ -9,25 +9,25 @@
  #include <math.h>
  #include <algorithm>
  #if defined(__BORLANDC__)
---- VTK-5.0.4/Utilities/DICOMParser/DICOMFile.cxx.gcc43	2007-11-07 13:51:57.000000000 -0700
-+++ VTK-5.0.4/Utilities/DICOMParser/DICOMFile.cxx	2008-02-18 10:31:08.000000000 -0700
-@@ -26,7 +26,7 @@
- #include "DICOMFile.h"
+--- 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 <stdio.h>
 -#include <string>
 +#include <cstring>
  
- DICOMFile::DICOMFile() : InputStream()
- {
---- VTK-5.0.4/Utilities/DICOMParser/DICOMParser.cxx.gcc43	2007-11-07 13:51:57.000000000 -0700
-+++ VTK-5.0.4/Utilities/DICOMParser/DICOMParser.cxx	2008-02-18 10:33:07.000000000 -0700
-@@ -39,7 +39,7 @@
+ #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 <sys/types.h>
  #endif
  
 -#include <string>
 +#include <cstring>
  
- // Define DEBUG_DICOM to get debug messages sent to dicom_stream::cerr
- // #define DEBUG_DICOM
+ #include "DICOMConfig.h"
+ #include "DICOMParser.h"


Index: vtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vtk/devel/vtk.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vtk.spec	26 Aug 2008 17:18:39 -0000	1.12
+++ vtk.spec	1 Oct 2008 16:12:49 -0000	1.13
@@ -7,7 +7,7 @@
 Summary: The Visualization Toolkit - A high level 3D visualization library
 Name: vtk
 Version: 5.0.4
-Release: 24%{?dist}
+Release: 25%{?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
@@ -372,6 +372,9 @@
 %{_libdir}/vtk-examples-5.0
 
 %changelog
+* Wed Oct 1 2008 Orion Poplawski <orion at cora.nwra.com> - 5.0.2-25
+- Fix patch fuzz
+
 * Mon Aug 25 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.0.4-24
 - Change java build dependencies from java-devel to gcj.