From f71f809f371cf361a5f3b14c5ed0d7a0e8cd9c9f Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Jan 18 2008 22:40:06 +0000
Subject: - Add patch to fix parallel make

- Obsolete demos package (bug #428528)

---

diff --git a/paraview-3.2.1-make.patch b/paraview-3.2.1-make.patch
new file mode 100644
index 0000000..9245fb2
--- /dev/null
+++ b/paraview-3.2.1-make.patch
@@ -0,0 +1,21 @@
+Index: VTK/Examples/CMakeLists.txt
+===================================================================
+RCS file: /cvsroot/ParaView3/ParaView3/VTK/Examples/CMakeLists.txt,v
+retrieving revision 1.34
+retrieving revision 1.35
+diff -u -r1.34 -r1.35
+--- VTK/Examples/CMakeLists.txt	2 Aug 2007 21:58:03 -0000	1.34
++++ VTK/Examples/CMakeLists.txt	19 Dec 2007 20:22:39 -0000	1.35
+@@ -115,6 +115,12 @@
+   IF(VTK_USE_PARALLEL)
+     ADD_DEPENDENCIES(VTKExamplesTarget vtkParallel)
+   ENDIF(VTK_USE_PARALLEL)
++  IF(VTK_USE_INFOVIS)
++    ADD_DEPENDENCIES(VTKExamplesTarget vtkInfovis)
++  ENDIF(VTK_USE_INFOVIS)
++  IF(VTK_USE_VIEWS)
++    ADD_DEPENDENCIES(VTKExamplesTarget vtkViews)
++  ENDIF(VTK_USE_VIEWS)
+   IF(VTK_USE_QVTK)
+     ADD_DEPENDENCIES(VTKExamplesTarget QVTK)
+   ENDIF(VTK_USE_QVTK)
diff --git a/paraview.spec b/paraview.spec
index e4c5b37..40c3ead 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -6,7 +6,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -20,6 +20,7 @@ Patch1:         paraview-3.2.1-rpath.patch
 Patch2:         paraview-3.2.1-install.patch
 Patch3:         paraview-3.2.1-doc.patch
 Patch4:         paraview-3.2.1-assistant-qt4.patch
+Patch5:         paraview-3.2.1-make.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -37,6 +38,7 @@ Requires:       %{name}-data = %{version}-%{release}
 Requires:       qt4-assistant
 Requires(post):   /usr/bin/update-desktop-database
 Requires(postun): /usr/bin/update-desktop-database
+Obsoletes:      paraview-demos <= %{version}-%{release}
 
 
 %description
@@ -121,6 +123,7 @@ Requires:       %{name}-mpi = %{version}-%{release}
 %patch2 -p1 -b .install
 %patch3 -p1 -b .doc
 %patch4 -p1 -b .assistant-qt4
+%patch5 -p0 -b .make
 
 
 %build
@@ -151,8 +154,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
         -DBUILD_DOCUMENTATION:BOOL=ON \
         -DBUILD_EXAMPLES:BOOL=ON
 cmake ..
-#make VERBOSE=1 %{?_smp_mflags}
-make VERBOSE=1
+make VERBOSE=1 %{?_smp_mflags}
 popd
 %if %{build_mpi}
 mkdir fedora-mpi
@@ -185,8 +187,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
         -DBUILD_DOCUMENTATION:BOOL=ON \
         -DBUILD_EXAMPLES:BOOL=ON
 cmake ..
-#make VERBOSE=1 %{?_smp_mflags}
-make VERBOSE=1
+make VERBOSE=1 %{?_smp_mflags}
 %endif
 
 %install
@@ -365,6 +366,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Fri Jan 18 2008 - Orion Poplawski <orion@cora.nwra.com> - 3.2.1-3
+- Add patch to fix parallel make
+- Obsolete demos package (bug #428528)
+
 * Tue Dec 18 2007 - Orion Poplawski <orion@cora.nwra.com> - 3.2.1-2
 - Name ld.so.conf.d file with .conf extension
 - Drop parallel make for now