- Fix patch fuzz

This commit is contained in:
Orion Poplawski 2008-10-01 16:12:49 +00:00
parent 0b020a580d
commit b2eb6da39b
2 changed files with 15 additions and 12 deletions

View File

@ -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"

View File

@ -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 @@ rm -rf %{buildroot}
%{_libdir}/vtk-examples-5.0
%changelog
* Wed Oct 1 2008 Orion Poplawski <orion@cora.nwra.com> - 5.0.2-25
- Fix patch fuzz
* Mon Aug 25 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-24
- Change java build dependencies from java-devel to gcj.