rpms/paraview/devel paraview-3.2.1-hdf5.patch, NONE, 1.1 paraview-3.2.1-gcc43.patch, 1.2, 1.3 paraview.spec, 1.22, 1.23

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17327

Modified Files:
	paraview-3.2.1-gcc43.patch paraview.spec 
Added Files:
	paraview-3.2.1-hdf5.patch 
Log Message:
* Wed Mar 5 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.1-5
- Rebuild for hdf5 1.8.0 using compatability API define and new patch


paraview-3.2.1-hdf5.patch:

--- NEW FILE paraview-3.2.1-hdf5.patch ---
--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx.hdf5	2008-02-29 22:13:27.000000000 -0700
+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx	2008-03-04 16:16:27.000000000 -0700
@@ -346,10 +346,17 @@
   HCoordinates[i] = Coordinates[i];
   }
 #if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>6)||((H5_VERS_MINOR==6)&&(H5_VERS_RELEASE>=4))))
+# if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>6)||((H5_VERS_MINOR==6)&&(H5_VERS_RELEASE>=7))))
+status = H5Sselect_elements( this->DataSpace,
+        H5S_SELECT_SET,
+         NElements,
+         ( const hsize_t *)HCoordinates);
+# else
 status = H5Sselect_elements( this->DataSpace,
         H5S_SELECT_SET,
          NElements,
          ( const hsize_t **)HCoordinates);
+# endif
 #else
 status = H5Sselect_elements( this->DataSpace,
         H5S_SELECT_SET,

paraview-3.2.1-gcc43.patch:

Index: paraview-3.2.1-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview-3.2.1-gcc43.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paraview-3.2.1-gcc43.patch	1 Mar 2008 04:24:51 -0000	1.2
+++ paraview-3.2.1-gcc43.patch	5 Mar 2008 16:05:01 -0000	1.3
@@ -96,16 +96,6 @@
  
  // typedef XdmfPointer XdmfXmlNode;
  struct _xmlNode;
---- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx.gcc43	2007-11-07 13:51:40.000000000 -0700
-+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx	2008-02-18 11:40:41.000000000 -0700
-@@ -23,6 +23,7 @@
- /*                                                                 */
- /*******************************************************************/
- #include "XdmfDataDesc.h"
-+#include <cstdlib>
- 
- XdmfDataDesc::XdmfDataDesc() {
-   H5dont_atexit();
 --- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfObject.cxx.gcc43	2007-11-07 13:51:40.000000000 -0700
 +++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfObject.cxx	2008-02-18 11:42:04.000000000 -0700
 @@ -23,6 +23,7 @@
@@ -137,3 +127,14 @@
  
  #define XDMF_LONGEST_LENGTH     (XdmfInt64)~0
  #define XDMF_ARRAY_TAG_LENGTH  80
+--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx.gcc43	2007-11-07 13:51:40.000000000 -0700
++++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx	2008-02-29 22:13:27.000000000 -0700
+@@ -23,6 +23,8 @@
+ /*                                                                 */
+ /*******************************************************************/
+ #include "XdmfDataDesc.h"
++#include <cstdlib>
++#include <cstring>
+ 
+ XdmfDataDesc::XdmfDataDesc() {
+   H5dont_atexit();


Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- paraview.spec	29 Feb 2008 22:58:38 -0000	1.22
+++ paraview.spec	5 Mar 2008 16:05:01 -0000	1.23
@@ -22,6 +22,7 @@
 Patch4:         paraview-3.2.1-assistant-qt4.patch
 Patch5:         paraview-3.2.1-make.patch
 Patch6:         paraview-3.2.1-gcc43.patch
+Patch7:         paraview-3.2.1-hdf5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -126,6 +127,7 @@
 %patch4 -p1 -b .assistant-qt4
 %patch5 -p0 -b .make
 %patch6 -p1 -b .gcc43
+%patch7 -p1 -b .hdf5
 
 
 %build
@@ -368,8 +370,8 @@
 
 
 %changelog
-* Fri Feb 29 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.1-5
-- Rebuild for hdf5 1.8.0 using compatability API define
+* Wed Mar 5 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.1-5
+- Rebuild for hdf5 1.8.0 using compatability API define and new patch
 
 * Mon Feb 18 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.1-4
 - Add patch to compile with gcc 4.3