rpms/paraview/devel paraview-3.3.0-gcc43.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 paraview.spec, 1.23, 1.24 sources, 1.5, 1.6 paraview-3.2-qt.patch, 1.1, NONE paraview-3.2.1-gcc43.patch, 1.3, NONE paraview-3.2.1-install.patch, 1.1, NONE paraview-3.2.1-make.patch, 1.1, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Tue May 20 19:29:41 UTC 2008
Author: orion
Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22016
Modified Files:
.cvsignore paraview.spec sources
Added Files:
paraview-3.3.0-gcc43.patch
Removed Files:
paraview-3.2-qt.patch paraview-3.2.1-gcc43.patch
paraview-3.2.1-install.patch paraview-3.2.1-make.patch
Log Message:
* Wed May 20 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.3.0-0.20080520.1
- Update to 3.3.0 CVS snapshot
- Update qt and gcc43 patches, drop unneeded patches
- Add openssl-devel, gnuplot, and wget BRs
- Update license text filename
- Set VTK_USE_RPATH to off, needed with development versions
- Run ctest in %check - still need to exclude more tests
paraview-3.3.0-gcc43.patch:
--- NEW FILE paraview-3.3.0-gcc43.patch ---
--- ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43 2007-11-07 13:51:57.000000000 -0700
+++ ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMAppHelper.cxx 2008-02-14 15:57:15.000000000 -0700
@@ -29,6 +29,7 @@
#include "DICOMAppHelper.h"
#include "DICOMCallback.h"
+#include <cstring>
#include <stdlib.h>
#include <stdio.h>
#include <string>
--- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaImage.cxx.gcc43 2007-11-07 13:52:00.000000000 -0700
+++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaImage.cxx 2008-02-18 10:44:29.000000000 -0700
@@ -18,7 +18,8 @@
#include <stdio.h>
#include <ctype.h>
-#include <string>
+#include <cstring>
+#include <cstdlib>
#include <string.h> // for memcpy
#include <math.h>
--- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaOutput.cxx.gcc43 2007-11-07 13:52:00.000000000 -0700
+++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaOutput.cxx 2008-02-18 10:47:24.000000000 -0700
@@ -32,6 +32,7 @@
#include <arpa/inet.h>
#endif
+#include <cstring>
#include <typeinfo>
#if (METAIO_USE_NAMESPACE)
--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfLightData.h.gcc43 2007-11-07 13:51:40.000000000 -0700
+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfLightData.h 2008-02-18 11:38:06.000000000 -0700
@@ -26,7 +26,7 @@
#define __XdmfLightData_h
#include "XdmfObject.h"
-
+#include <cstring>
// typedef XdmfPointer XdmfXmlNode;
struct _xmlNode;
--- 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 @@
/* */
/*******************************************************************/
#include "XdmfObject.h"
+#include <cstring>
static XdmfInt32 GlobalDebugFlag = 0;
static XdmfInt64 NameCntr = 0;
--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfRoot.cxx.gcc43 2007-11-07 13:51:40.000000000 -0700
+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfRoot.cxx 2008-02-18 11:43:10.000000000 -0700
@@ -24,6 +24,7 @@
/*******************************************************************/
#include "XdmfRoot.h"
#include "XdmfDOM.h"
+#include <cstdlib>
XdmfRoot::XdmfRoot() {
this->SetElementName("Xdmf");
--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfArray.h.gcc43 2007-11-07 13:51:40.000000000 -0700
+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfArray.h 2008-02-29 21:23:35.000000000 -0700
@@ -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/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx.gcc43 2007-11-07 13:51:40.000000000 -0700
+++ ParaView3.3.0/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx 2008-02-29 22:13:27.000000000 -0700
@@ -23,6 +23,7 @@
/* */
/*******************************************************************/
#include "XdmfDataDesc.h"
+#include <cstdlib>
XdmfDataDesc::XdmfDataDesc() {
H5dont_atexit();
--- ParaView3.3.0-20080512/Utilities/Xdmf2/libsrc/XdmfDataDesc.h.gcc43 2008-02-21 09:55:28.000000000 -0700
+++ ParaView3.3.0-20080512/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2008-05-12 16:51:07.000000000 -0600
@@ -27,6 +27,7 @@
#include "XdmfObject.h"
#include "XdmfHDFSupport.h"
+#include <cstring>
#define XDMF_SELECTALL 0
#define XDMF_HYPERSLAB 1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 18 Nov 2007 20:13:05 -0000 1.5
+++ .cvsignore 20 May 2008 19:28:52 -0000 1.6
@@ -1 +1 @@
-paraview-3.2.1.tar.gz
+ParaView3.3.0-20080520.tar.gz
Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- paraview.spec 5 Mar 2008 16:05:01 -0000 1.23
+++ paraview.spec 20 May 2008 19:28:52 -0000 1.24
@@ -1,27 +1,31 @@
%{!?build_mpi:%define build_mpi 1}
%define pv_maj 3
-%define pv_min 2
-%define pv_patch 1
+%define pv_min 3
+%define pv_patch 0
%define pv_majmin %{pv_maj}.%{pv_min}
+%define cvsdate 20080520
Name: paraview
Version: %{pv_majmin}.%{pv_patch}
-Release: 5%{?dist}
+Release: 0.%{cvsdate}.1%{?dist}
Summary: Parallel visualization application
Group: Applications/Engineering
License: BSD
URL: http://www.paraview.org/
-Source0: http://www.paraview.org/files/v%{pv_majmin}/paraview-%{version}.tar.gz
+#Source0: http://www.paraview.org/files/v%{pv_majmin}/paraview-%{version}.tar.gz
+Source0: ParaView%{version}-%{cvsdate}.tar.gz
Source1: paraview_22x22.png
Source2: paraview.xml
-Patch0: paraview-3.2-qt.patch
+#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
Patch1: paraview-3.2.1-rpath.patch
-Patch2: paraview-3.2.1-install.patch
Patch3: paraview-3.2.1-doc.patch
Patch4: paraview-3.2.1-assistant-qt4.patch
-Patch5: paraview-3.2.1-make.patch
-Patch6: paraview-3.2.1-gcc43.patch
+#Reported upstream: http://public.kitware.com/Bug/view.php?id=7022
+Patch6: paraview-3.3.0-gcc43.patch
+#Reported upstream: http://public.kitware.com/Bug/view.php?id=7023
Patch7: paraview-3.2.1-hdf5.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +40,9 @@
BuildRequires: /usr/bin/desktop-file-install
BuildRequires: doxygen, graphviz
BuildRequires: readline-devel
+BuildRequires: openssl-devel
+BuildRequires: gnuplot
+BuildRequires: wget
Requires: %{name}-data = %{version}-%{release}
Requires: qt4-assistant
Requires(post): /usr/bin/update-desktop-database
@@ -119,15 +126,15 @@
%prep
-%setup -q -n ParaView%{version}
+%setup -q -n ParaView%{version}-%{cvsdate}
%patch -p1 -b .qt
%patch1 -p1 -b .rpath
-%patch2 -p1 -b .install
%patch3 -p1 -b .doc
%patch4 -p1 -b .assistant-qt4
-%patch5 -p0 -b .make
%patch6 -p1 -b .gcc43
%patch7 -p1 -b .hdf5
+#Remove included hdf5 just to be sure
+rm -r Utilities/hdf5
%build
@@ -149,6 +156,7 @@
-DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
-DVTK_USE_INFOVIS:BOOL=OFF \
+ -DVTK_USE_RPATH:BOOL=OFF \
-DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -157,7 +165,6 @@
-DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-DBUILD_DOCUMENTATION:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=ON
-cmake ..
make VERBOSE=1 %{?_smp_mflags}
popd
%if %{build_mpi}
@@ -182,6 +189,7 @@
-DMPI_LIBRARY:STRING="-L%{_libdir}/openmpi" \
-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
-DVTK_USE_INFOVIS:BOOL=OFF \
+ -DVTK_USE_RPATH:BOOL=OFF \
-DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -190,7 +198,6 @@
-DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-DBUILD_DOCUMENTATION:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=ON
-cmake ..
make VERBOSE=1 %{?_smp_mflags}
%endif
@@ -286,6 +293,23 @@
#Don't ship the VTK Qt Designer plugin
rm -r $RPM_BUILD_ROOT/usr/plugins
+#Don't ship assistant
+rm $RPM_BUILD_ROOT/%{_bindir}/assistant{,-mpi}
+
+
+%check
+for dir in fedora fedora-mpi
+do
+ pushd $dir
+# Exclude the following tests:
+# QVTK-TestQtSQLDatabase - Needs a SQL database server
+# Mace - Needs X Display
+# pq* - Needs X Display
+# XXX - There are still a lot of failing tests. Need to investigate further
+ ctest -V -E '^(QVTK-TestQtSQLDatabase|Mace|pq)' || :
+ popd
+done
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -320,7 +344,7 @@
%files
%defattr(-,root,root,-)
-%doc License_v1.1.txt
+%doc License_v1.2.txt
%{_sysconfdir}/ld.so.conf.d/paraview-%{_arch}.conf
%{_bindir}/paraview
%{_bindir}/pvbatch
@@ -338,7 +362,7 @@
%if %{build_mpi}
%files mpi
%defattr(-,root,root,-)
-%doc License_v1.1.txt
+%doc License_v1.2.txt
%{_sysconfdir}/ld.so.conf.d/paraview-mpi-%{_arch}.conf
%{_bindir}/paraview-mpi
%{_bindir}/pvbatch-mpi
@@ -370,6 +394,14 @@
%changelog
+* Wed May 20 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.3.0-0.20080520.1
+- Update to 3.3.0 CVS snapshot
+- Update qt and gcc43 patches, drop unneeded patches
+- Add openssl-devel, gnuplot, and wget BRs
+- Update license text filename
+- Set VTK_USE_RPATH to off, needed with development versions
+- Run ctest in %%check - still need to exclude more tests
+
* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 18 Nov 2007 20:13:05 -0000 1.5
+++ sources 20 May 2008 19:28:52 -0000 1.6
@@ -1 +1 @@
-050830112537c477a1cb20370caded50 paraview-3.2.1.tar.gz
+c39e69f0b72196b7cfc725d88ae707d0 ParaView3.3.0-20080520.tar.gz
--- paraview-3.2-qt.patch DELETED ---
--- paraview-3.2.1-gcc43.patch DELETED ---
--- paraview-3.2.1-install.patch DELETED ---
--- paraview-3.2.1-make.patch DELETED ---
More information about the fedora-extras-commits
mailing list