From 6a4c38bbe83b1c56d5e7a72eadf6fdd5ae5cfe93 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Aug 12 2013 20:41:51 +0000
Subject: Use more system libraries; pvblot is disabled


---

diff --git a/paraview.spec b/paraview.spec
index 1a87716..0c7ab06 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -37,10 +37,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cmake
 %if %{build_openmpi}
 BuildRequires:  openmpi-devel
+BuildRequires:  mpi4py-openmpi
 BuildRequires:  netcdf-openmpi-devel
 %endif
 %if %{build_mpich}
 BuildRequires:  mpich-devel
+BuildRequires:  mpi4py-mpich
 BuildRequires:  netcdf-mpich-devel
 %endif
 BuildRequires:  qt-devel
@@ -97,8 +99,13 @@ Provides:       paraview-doc = %{version}-%{release}
         -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\\
         -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \\\
         -DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON \\\
+        -DPARAVIEW_USE_SYSTEM_AUTOBAHN:BOOL=ON \\\
+        -DPARAVIEW_USE_SYSTEM_MPI4PY:BOOL=ON \\\
+        -DPARAVIEW_USE_SYSTEM_TWISTED:BOOL=ON \\\
+        -DPARAVIEW_USE_SYSTEM_ZOPE:BOOL=ON \\\
         -DVTK_CUSTOM_LIBRARY_SUFFIX="" \\\
         -DVTK_INSTALL_PACKAGE_DIR=share/cmake/paraview \\\
+        -DVTK_PYTHON_SETUP_ARGS="--prefix=/usr --root=%{buildroot}" \\\
         -DVTK_USE_BOOST:BOOL=ON \\\
         -DVTK_USE_INFOVIS:BOOL=OFF \\\
         -DVTK_USE_N_WAY_ARRAYS:BOOL=ON \\\
@@ -231,9 +238,9 @@ developing applications that use %{name}-mpich.
 %patch2 -p1 -b .Protobuf
 %patch3 -p0 -b .netcdf
 #Remove included thirdparty sources just to be sure
-for x in protobuf
+for x in autobahn vtkmpi4py vtkprotobuf twisted zope
 do
-  rm -r ThirdParty/${x}/vtk${x}
+  rm -r ThirdParty/*/${x}
 done
 for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png sqlite tiff zlib
 do
@@ -399,7 +406,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %doc License_v1.2.txt
 %{_bindir}/paraview
 %{_bindir}/pvbatch
-%{_bindir}/pvblot
+# Currently disabled upstream
+#{_bindir}/pvblot
 %{_bindir}/pvdataserver
 %{_bindir}/pvpython
 %{_bindir}/pvrenderserver