rpms/paraview/devel paraview-3.2.1-make.patch, NONE, 1.1 paraview.spec, 1.19, 1.20

[Orion Poplawski (orion)]

Author: orion

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

Modified Files:
	paraview.spec 
Added Files:
	paraview-3.2.1-make.patch 
Log Message:
* Fri Jan 18 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.1-3
- Add patch to fix parallel make
- Obsolete demos package (bug #428528)


paraview-3.2.1-make.patch:

--- NEW FILE paraview-3.2.1-make.patch ---
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)


Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- paraview.spec	19 Dec 2007 18:10:49 -0000	1.19
+++ paraview.spec	18 Jan 2008 22:40:06 -0000	1.20
@@ -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 @@
 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:       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 @@
 %patch2 -p1 -b .install
 %patch3 -p1 -b .doc
 %patch4 -p1 -b .assistant-qt4
+%patch5 -p0 -b .make
 
 
 %build
@@ -151,8 +154,7 @@
         -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 @@
         -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 @@
 
 
 %changelog
+* Fri Jan 18 2008 - Orion Poplawski <orion at 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 at cora.nwra.com> - 3.2.1-2
 - Name ld.so.conf.d file with .conf extension
 - Drop parallel make for now