rpms/paraview/devel paraview.spec,1.10,1.11

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4111

Modified Files:
	paraview.spec 
Log Message:
Don't build mpi version until upstream fixes the build system



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- paraview.spec	22 Dec 2006 22:01:08 -0000	1.10
+++ paraview.spec	9 Mar 2007 18:29:29 -0000	1.11
@@ -1,3 +1,5 @@
+%{!?build_mpi:%define build_mpi 0}
+
 Name:           paraview
 Version:        2.4.4
 Release:        5%{?dist}
@@ -16,7 +18,10 @@
 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 @@
 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 @@
 
 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 @@
         -DBUILD_EXAMPLES:BOOL=ON
 make
 popd
+%if %{build_mpi}
 mkdir fedora-mpi
 pushd fedora-mpi
 export CC='gcc'
@@ -168,7 +176,7 @@
         -DBUILD_DOCUMENTATION:BOOL=ON \
         -DBUILD_EXAMPLES:BOOL=ON
 make
-
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -183,6 +191,7 @@
 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 @@
    mv $f ${f}-mpi
 done
 popd
+%endif
 
 #Install the normal version
 pushd fedora
@@ -261,11 +271,13 @@
 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 @@
 %{_libdir}/paraview-2.4/
 
 
+%if %{build_mpi}
 %files mpi
 %defattr(-,root,root,-)
 %doc Copyright.txt README.html
@@ -301,6 +314,7 @@
 %{_bindir}/pvserver-mpi
 %{_datadir}/applications/fedora-paraview-mpi.desktop
 %{_libdir}/paraview-2.4-mpi/
+%endif
 
 
 %files data
@@ -317,6 +331,9 @@
 
 
 %changelog
+* Thu Mar 08 2007 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-6
+- Don't build mpi version until upstream fixes the build system
+
 * Fri Dec 22 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-5
 - Fix .so permissions
 - Patch for const issue