From 45f7118a6bc2cde07490d353c50a2d5b86c509b6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mar 09 2007 18:29:29 +0000 Subject: Don't build mpi version until upstream fixes the build system --- diff --git a/paraview.spec b/paraview.spec index ca765c7..a5d17ed 100644 --- a/paraview.spec +++ b/paraview.spec @@ -1,3 +1,5 @@ +%{!?build_mpi:%define build_mpi 0} + Name: paraview Version: 2.4.4 Release: 5%{?dist} @@ -16,7 +18,10 @@ Patch3: paraview-2.4.4-const.patch Patch4: paraview-2.4.4-cmake245.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cmake, openmpi-devel +BuildRequires: cmake +%if %{build_mpi} +BuildRequires: openmpi-devel +%endif BuildRequires: libGLU-devel, libXt-devel, mesa-libOSMesa-devel BuildRequires: python-devel, tk-devel, hdf5-devel BuildRequires: freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel @@ -46,6 +51,7 @@ user interface written using a unique blend of Tcl/Tk and C++. NOTE: This version has NOT been compiled with MPI support. +%if %{build_mpi} %package mpi Summary: Parallel visualization application Group: Applications/Engineering @@ -71,6 +77,7 @@ user interface written using a unique blend of Tcl/Tk and C++. NOTE: This version has been compiled with LAM-MPI support and requires an operating LAM-MPI runtime enviroment. +%endif %package data @@ -136,6 +143,7 @@ cmake .. \ -DBUILD_EXAMPLES:BOOL=ON make popd +%if %{build_mpi} mkdir fedora-mpi pushd fedora-mpi export CC='gcc' @@ -168,7 +176,7 @@ cmake .. \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON make - +%endif %install rm -rf $RPM_BUILD_ROOT @@ -183,6 +191,7 @@ install -m644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/pixmaps install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/mime/packages +%if %{build_mpi} # Install mpi version pushd fedora-mpi make install DESTDIR=$RPM_BUILD_ROOT @@ -219,6 +228,7 @@ do mv $f ${f}-mpi done popd +%endif #Install the normal version pushd fedora @@ -261,11 +271,13 @@ update-desktop-database &> /dev/null ||: update-desktop-database &> /dev/null ||: +%if %{build_mpi} %post mpi update-desktop-database &> /dev/null ||: %postun mpi update-desktop-database &> /dev/null ||: +%endif %post data @@ -289,6 +301,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/paraview-2.4/ +%if %{build_mpi} %files mpi %defattr(-,root,root,-) %doc Copyright.txt README.html @@ -301,6 +314,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_bindir}/pvserver-mpi %{_datadir}/applications/fedora-paraview-mpi.desktop %{_libdir}/paraview-2.4-mpi/ +%endif %files data @@ -317,6 +331,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Thu Mar 08 2007 - Orion Poplawski - 2.4.4-6 +- Don't build mpi version until upstream fixes the build system + * Fri Dec 22 2006 - Orion Poplawski - 2.4.4-5 - Fix .so permissions - Patch for const issue