[paraview/f14/master] - Update to 3.8.1 - Drop installpath patch - Drop hdf5-1.8 patch, build with hdf5 1.8 API - Cleanup

[Orion Poplawski]

commit 9a3b45016ea6d3cdf93abdc1c6aecaef563eacb6
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Oct 4 09:38:01 2010 -0600

    - Update to 3.8.1
    - Drop installpath patch
    - Drop hdf5-1.8 patch, build with hdf5 1.8 API
    - Cleanup build

 .gitignore                       |    1 +
 paraview-3.8.0-hdf5-1.8.patch    |   11 -------
 paraview-3.8.0-installpath.patch |   56 --------------------------------------
 paraview.spec                    |   46 ++++++++-----------------------
 sources                          |    2 +-
 5 files changed, 14 insertions(+), 102 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5df6452..e0e4157 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ParaView-3.8.0.tar.gz
+/ParaView-3.8.1.tar.gz
diff --git a/paraview.spec b/paraview.spec
index 25099fd..47c5878 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -2,14 +2,14 @@
 %{!?build_mpich2:%global build_mpich2 1}
 %define pv_maj 3
 %define pv_min 8
-%define pv_patch 0
+%define pv_patch 1
 %define pv_majmin %{pv_maj}.%{pv_min}
 
 %{!?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:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -23,8 +23,6 @@ Source2:        paraview.xml
 Patch0:         paraview-3.6.2-libs.patch
 #Add some needed includes
 Patch1:         paraview-3.8.0-include.patch
-#Upstream patch to fix install paths
-Patch2:         paraview-3.8.0-installpath.patch
 #Support Python 2.7
 Patch3:         paraview-3.8.0-py27.patch
 #Installs PointSpriteDemo into incorrect location, remove install for now
@@ -32,8 +30,6 @@ Patch3:         paraview-3.8.0-py27.patch
 Patch5:         paraview-3.8.0-demo.patch
 #Reported upstream: http://public.kitware.com/mantis/view.php?id=7023
 Patch7:         paraview-3.2.2-hdf5.patch
-#Change H5_USE_16_API_DEFAULT to H5_USE_16_API
-Patch8:         paraview-3.8.0-hdf5-1.8.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -211,39 +207,30 @@ BuildArch:      noarch
 %setup -q -n ParaView-%{version}
 %patch0 -p1 -b .libs
 %patch1 -p1 -b .include
-%patch2 -p1 -b .installpath
 %patch3 -p1 -b .py27
 %patch5 -p1 -b .demo
 %patch7 -p1 -b .hdf5
-%patch8 -p1 -b .hdf5-1.8
 #Remove included hdf5 just to be sure
 rm -r Utilities/hdf5
 
 
 %build
-mkdir fedora
-pushd fedora
 export CC='gcc'
 export CXX='g++'
 export MAKE='make'
-export CFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
-export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+mkdir fedora
+pushd fedora
 %cmake .. \
         -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview \
         %{paraview_cmake_options}
-##Need to run cmake twice to get MPI headers into VTK/Parallel build config
-cmake ..
 make VERBOSE=1 %{?_smp_mflags}
 popd
 %if %{build_openmpi}
 mkdir fedora-openmpi
 pushd fedora-openmpi
 %{_openmpi_load}
-export CC='gcc'
-export CXX='g++'
-export MAKE='make'
-export CFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
-export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
 %cmake .. \
         -DPV_INSTALL_BIN_DIR:PATH=%{_lib}/openmpi/bin \
         -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/openmpi/lib/paraview \
@@ -251,8 +238,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
         -DICET_BUILD_TESTING:BOOL=ON \
         -DMPI_COMPILER:FILEPATH=%{_libdir}/openmpi/bin/mpicxx \
         %{paraview_cmake_options}
-#Need to run cmake twice to get MPI headers into VTK/Parallel build config
-cmake ..
 make VERBOSE=1 %{?_smp_mflags}
 %{_openmpi_unload}
 popd
@@ -261,11 +246,6 @@ popd
 mkdir fedora-mpich2
 pushd fedora-mpich2
 %{_mpich2_load}
-export CC='gcc'
-export CXX='g++'
-export MAKE='make'
-export CFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
-export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
 %cmake .. \
         -DPV_INSTALL_BIN_DIR:PATH=%{_lib}/mpich2/bin \
         -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/mpich2/lib/paraview \
@@ -273,8 +253,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
         -DICET_BUILD_TESTING:BOOL=ON \
         -DMPI_COMPILER:FILEPATH=%{_libdir}/mpich2/bin/mpicxx \
         %{paraview_cmake_options}
-#Need to run cmake twice to get MPI headers into VTK/Parallel build config
-cmake ..
 make VERBOSE=1 %{?_smp_mflags}
 %{_mpich2_unload}
 popd
@@ -364,9 +342,6 @@ desktop-file-install --vendor=fedora \
 
 popd
 
-#Don't ship the VTK Qt Designer plugin
-rm -r $RPM_BUILD_ROOT/usr/plugins
-
 #Don't ship lproj - provided by vtk
 rm $RPM_BUILD_ROOT%{_bindir}/lproj
 
@@ -405,8 +380,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_bindir}/smTestDriver
 %{_bindir}/streaming_paraview
 %{_libdir}/paraview/
-%exclude %{_libdir}/paraview/doc/
-%{python_sitelib}/Xdmf/
 
 
 %if %{build_mpich2}
@@ -445,10 +418,15 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/paraview-%{pv_majmin}/
-%doc %{_libdir}/paraview/doc/
 
 
 %changelog
+* Fri Oct 1 2010 Orion Poplawski <orion at cora.nwra.com> - 3.8.1-1
+- Update to 3.8.1
+- Drop installpath patch
+- Drop hdf5-1.8 patch, build with hdf5 1.8 API
+- Cleanup build
+
 * Fri Jul 30 2010 Orion Poplawski <orion at cora.nwra.com> - 3.8.0-4
 - Add patch to support python 2.7
 
diff --git a/sources b/sources
index a7e7d9f..3899b64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f371631c373452b202a3d91f2cca12f  ParaView-3.8.0.tar.gz
+b432b9e68cc308ae8f086d759f578125  ParaView-3.8.1.tar.gz