rpms/paraview/devel paraview-3.3.1-gcc43.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 paraview.spec, 1.25, 1.26 sources, 1.7, 1.8 paraview-3.3.0-gcc43.patch, 1.2, NONE paraview-3.3.0-qt.patch, 1.1, NONE

[Orion Poplawski]

Author: orion

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

Modified Files:
	.cvsignore paraview.spec sources 
Added Files:
	paraview-3.3.1-gcc43.patch 
Removed Files:
	paraview-3.3.0-gcc43.patch paraview-3.3.0-qt.patch 
Log Message:
* Thu Oct 2 2008 Orion Poplawski <orion at cora.nwra.com> - 3.4.0-0.20081002.1
- Update 3.4.0 CVS snapshot
- Update gcc43 patch
- Drop qt patch, upstream now allows compiling against Qt 4.4.*


paraview-3.3.1-gcc43.patch:

--- NEW FILE paraview-3.3.1-gcc43.patch ---
--- ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfArray.h.gcc43	2008-06-26 14:52:35.000000000 -0600
+++ ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfArray.h	2008-07-16 12:03:40.000000000 -0600
@@ -26,6 +26,7 @@
 #define __XdmfArray_h
 
 #include "XdmfDataDesc.h"
+#include <cstdlib>
 
 #define XDMF_LONGEST_LENGTH     (XdmfInt64)~0
 #define XDMF_ARRAY_TAG_LENGTH  80
--- ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfDataDesc.h.gcc43	2008-03-04 14:54:42.000000000 -0700
+++ ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfDataDesc.h	2008-07-16 12:03:40.000000000 -0600
@@ -27,6 +27,7 @@
 
 #include "XdmfObject.h"
 #include "XdmfHDFSupport.h"
+#include <cstring>
 
 #define XDMF_SELECTALL    0
 #define XDMF_HYPERSLAB    1
--- ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx.gcc43	2008-07-15 17:22:46.000000000 -0600
+++ ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx	2008-07-16 12:03:40.000000000 -0600
@@ -34,6 +34,7 @@
 #include "XdmfDsmComm.h"
 #include "assert.h"
 #include "hdf5.h"
+#include <cstring>
 
 #include <stdlib.h>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Aug 2008 17:11:53 -0000	1.7
+++ .cvsignore	3 Oct 2008 16:24:35 -0000	1.8
@@ -1 +1 @@
-ParaView3.3.1-20080811.tar.gz
+ParaView3.4.0-20081002.tar.gz


Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- paraview.spec	15 Aug 2008 17:11:53 -0000	1.25
+++ paraview.spec	3 Oct 2008 16:24:36 -0000	1.26
@@ -1,9 +1,9 @@
 %{!?build_mpi:%define build_mpi 1}
 %define pv_maj 3
-%define pv_min 3
-%define pv_patch 1
+%define pv_min 4
+%define pv_patch 0
 %define pv_majmin %{pv_maj}.%{pv_min}
-%define cvsdate 20080811
+%define cvsdate 20081002
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
@@ -14,19 +14,17 @@
 License:        BSD
 URL:            http://www.paraview.org/
 #Source0:        http://www.paraview.org/files/v%{pv_majmin}/paraview-%{version}.tar.gz
+#Created from latest CVS on branch ParaView-3-4
 Source0:        ParaView%{version}-%{cvsdate}.tar.gz
 Source1:        paraview_22x22.png
 Source2:        paraview.xml
-#ParaView only officially supports a specific Qt version, but we
-#need to use whatever we have.  This disables the versoin check.
-Patch0:         paraview-3.3.0-qt.patch
 #Don't try to copy Qt libraries into paraview directory
 Patch2:         paraview-3.3.0-install.patch
 #Move pqClient.adp into %{_datadir}/paraview
 Patch3:         paraview-3.3.0-doc.patch
 Patch4:         paraview-3.2.1-assistant-qt4.patch
 #Reported upstream: http://public.kitware.com/Bug/view.php?id=7022
-Patch6:         paraview-3.3.0-gcc43.patch
+Patch6:         paraview-3.3.1-gcc43.patch
 #Reported upstream: http://public.kitware.com/mantis/view.php?id=7023
 Patch7:         paraview-3.2.2-hdf5.patch
 Patch8:         paraview-3.2.2-hdf5-1.8.patch
@@ -110,7 +108,6 @@
 
 %prep
 %setup -q -n ParaView%{version}-%{cvsdate}
-%patch0 -p1 -b .qt
 %patch2 -p1 -b .install
 %patch3 -p1 -b .doc
 %patch4 -p1 -b .assistant-qt4
@@ -328,6 +325,11 @@
 
 
 %changelog
+* Thu Oct 2 2008 Orion Poplawski <orion at cora.nwra.com> - 3.4.0-0.20081002.1
+- Update 3.4.0 CVS snapshot
+- Update gcc43 patch
+- Drop qt patch, upstream now allows compiling against Qt 4.4.*
+
 * Mon Aug 11 2008 Orion Poplawski <orion at cora.nwra.com> - 3.3.1-0.20080811.1
 - Update 3.3.1 CVS snapshot
 - Update hdf5 patch to drop upstreamed changes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Aug 2008 17:11:53 -0000	1.7
+++ sources	3 Oct 2008 16:24:36 -0000	1.8
@@ -1 +1 @@
-71831b83073081d9031219c4440566cf  ParaView3.3.1-20080811.tar.gz
+d6bd6f6fe7b4f264d1521072ac7b427e  ParaView3.4.0-20081002.tar.gz


--- paraview-3.3.0-gcc43.patch DELETED ---


--- paraview-3.3.0-qt.patch DELETED ---