From 49bd0b0b28e07723a1c808be8c4f08f65167fa4a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Feb 29 2012 16:00:38 +0000 Subject: Update to 3.14.0 Rebase gcc47 patch Try to handle python install problems manually --- diff --git a/.gitignore b/.gitignore index 761573d..651119c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ ParaView-3.8.1.tar.gz /ParaView-3.10.0.tar.gz /ParaView-3.10.1.tar.gz /ParaView-3.12.0.tar.gz +/ParaView-3.14.0-Source.tar.gz diff --git a/paraview-gcc47.patch b/paraview-gcc47.patch index c34e901..7cd826c 100644 --- a/paraview-gcc47.patch +++ b/paraview-gcc47.patch @@ -1,18 +1,6 @@ -diff -up ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h.gcc47 ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h ---- ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h.gcc47 2012-01-27 12:12:55.623530977 -0700 -+++ ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h 2012-01-30 15:26:33.107335300 -0700 -@@ -72,7 +72,7 @@ public: - Clear = QItemSelectionModel::Clear, - Select = QItemSelectionModel::Select, - Deselect = QItemSelectionModel::Deselect, -- ClearAndSelect = Clear | Select -+ ClearAndSelect = static_cast(Clear) | static_cast(Select) - }; - Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag) - -diff -up ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx ---- ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 2011-11-08 13:56:29.000000000 -0700 -+++ ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx 2012-01-27 09:30:00.088542888 -0700 +diff -up ParaView-3.14.0-RC2/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 ParaView-3.14.0-RC2/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx +--- ParaView-3.14.0-RC2/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 2012-02-09 10:43:55.000000000 -0700 ++++ ParaView-3.14.0-RC2/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx 2012-02-11 14:30:02.946878437 -0700 @@ -37,6 +37,8 @@ #include "vtkTimeSourceExample.h" #include "vtkXdmfReader.h" @@ -22,3 +10,26 @@ diff -up ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 #define NUMTESTS 20 const char testobject[NUMTESTS][40] = { +diff -up ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeTools.cxx.gcc47 ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeTools.cxx +--- ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeTools.cxx.gcc47 2012-02-09 10:45:19.000000000 -0700 ++++ ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeTools.cxx 2012-02-11 13:53:22.515115770 -0700 +@@ -31,6 +31,8 @@ + // The embedded fonts + #include "fonts/vtkEmbeddedFonts.h" + ++#include ++ + #ifdef FTGL_USE_NAMESPACE + using namespace ftgl; + #endif +diff -up ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeUtilities.cxx.gcc47 ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeUtilities.cxx +--- ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeUtilities.cxx.gcc47 2012-02-09 10:45:19.000000000 -0700 ++++ ParaView-3.14.0-RC2/VTK/Rendering/vtkFreeTypeUtilities.cxx 2012-02-11 11:34:44.396589034 -0700 +@@ -31,6 +31,7 @@ + #include "fonts/vtkEmbeddedFonts.h" + + #include ++#include + + #ifdef FTGL_USE_NAMESPACE + using namespace ftgl; diff --git a/paraview.spec b/paraview.spec index 097b0bd..502881e 100644 --- a/paraview.spec +++ b/paraview.spec @@ -4,29 +4,26 @@ %{!?build_openmpi:%global build_openmpi 1} %{!?build_mpich2:%global build_mpich2 1} %global pv_maj 3 -%global pv_min 12 +%global pv_min 14 %global pv_patch 0 %global pv_majmin %{pv_maj}.%{pv_min} -%global rcver %{nil} +#global rcver -RC2 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 7%{?dist} +Release: 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}%{?rcver}.tar.gz +Source0: http://www.paraview.org/files/v%{pv_majmin}/ParaView-%{version}%{?rcver}-Source.tar.gz Source1: paraview_22x22.png Source2: paraview.xml #Add some needed includes Patch1: paraview-3.8.0-include.patch -#Patch to build with boost 1.48 -#Reported upstream: http://paraview.org/Bug/view.php?id=12772 -Patch2: paraview-3.12.0-boost-1.48.0-bfs.patch #Patch to build with gcc 4.7 #Reported upstream: http://paraview.org/Bug/view.php?id=12881 Patch3: paraview-gcc47.patch @@ -221,9 +218,8 @@ developing applications that use %{name}-mpich2. %prep -%setup -q -n ParaView-%{version}%{?rcver} +%setup -q -n ParaView-%{version}%{?rcver}-Source %patch1 -p1 -b .include -%patch2 -p1 -b .boost %patch3 -p1 -b .gcc47 %patch7 -p1 -b .hdf5 #Remove included hdf5 just to be sure @@ -314,8 +310,12 @@ popd #Remove mpi copy of man pages rm -rf $RPM_BUILD_ROOT%{_mandir} +# Move python files by hand for now +cp -rp $RPM_BUILD_ROOT%{_libdir}/openmpi/bin/Python/vtk $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/site-packages/ +rm -rf $RPM_BUILD_ROOT%{_libdir}/openmpi/bin/Python + #Install vtk*Python.so by hand for now -cp -p bin/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/site-packages/paraview/vtk/ +mv $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/site-packages/paraview/vtk/ mv $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/site-packages/paraview/vtk/vtkPV*Python.so $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/site-packages/paraview/ popd %endif @@ -339,8 +339,12 @@ popd #Remove mpi copy of man pages rm -rf $RPM_BUILD_ROOT%{_mandir} +# Move python files by hand for now +cp -rp $RPM_BUILD_ROOT%{_libdir}/mpich2/bin/Python/vtk $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/site-packages/ +rm -rf $RPM_BUILD_ROOT%{_libdir}/mpich2/bin/Python + #Install vtk*Python.so by hand for now -cp -p bin/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/site-packages/paraview/vtk/ +mv $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/site-packages/paraview/vtk/ mv $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/site-packages/paraview/vtk/vtkPV*Python.so $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/site-packages/paraview/ popd %endif @@ -369,8 +373,12 @@ desktop-file-install --vendor=fedora \ --dir %{buildroot}%{_datadir}/applications/ \ paraview.desktop +# Move python files by hand for now +cp -rp $RPM_BUILD_ROOT%{_bindir}/Python/vtk $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/ +rm -rf $RPM_BUILD_ROOT%{_bindir}/Python + #Install vtk*Python.so by hand for now -cp -p bin/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/ +mv $RPM_BUILD_ROOT%{_libdir}/paraview/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/ mv $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/vtkPV*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/ #Cleanup vtk binaries @@ -461,6 +469,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Wed Feb 29 2012 Orion Poplawski - 3.14.0-1 +- Update to 3.14.0 +- Rebase gcc47 patch +- Try to handle python install problems manually + * Thu Jan 27 2012 Orion Poplawski - 3.12.0-7 - Build with gcc 4.7 - Add patch to support gcc 4.7 diff --git a/sources b/sources index 8e996e6..15aeb6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8feabc6261e2060648eaac593d85b1de ParaView-3.12.0.tar.gz +a260bd891fd75d0e276a581a3603edff ParaView-3.14.0-Source.tar.gz