rpms/paraview/F-7 paraview-3.2.1-make.patch, NONE, 1.1 paraview.spec, 1.14, 1.15

Orion Poplawski (orion) fedora-extras-commits at redhat.com
Fri Jan 18 23:12:04 UTC 2008 

Author: orion

Update of /cvs/pkgs/rpms/paraview/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19668

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/F-7/paraview.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- paraview.spec	19 Dec 2007 02:55:33 -0000	1.14
+++ paraview.spec	18 Jan 2008 23:11:29 -0000	1.15
@@ -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
@@ -363,10 +366,15 @@
 
 
 %changelog
-* Tue Dec 18 2007 - Orion Poplawski <orion at cora.wnra.com> - 3.2.1-2
+* 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
 
-* Mon Dec 03 2007 - Orion Poplawski <orion at cora.wnra.com> - 3.2.1-1
+* Mon Dec 03 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.2.1-1
 - Update to 3.2.1
 - Use macros for version numbers
 - Add patches to fix documentation install location and use assistant-qt4,
@@ -374,22 +382,22 @@
 - Install ld.so.conf.d file
 - Fixup desktop files
 
-* Thu Aug 23 2007 - Orion Poplawski <orion at cora.wnra.com> - 3.0.2-2
+* Thu Aug 23 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.0.2-2
 - Update license tag to BSD
 - Fix make %%{_smp_mflags}
 - Rebuild for ppc32
 
-* Wed Jul 11 2007 - Orion Poplawski <orion at cora.wnra.com> - 3.0.2-1
+* Wed Jul 11 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.0.2-1
 - Update to 3.0.2
 - Turn mpi build back on
 - Add devel packages
 - Remove demo package no longer in upstream
 - Use cmake macros
 
-* Thu Mar 08 2007 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-6
+* Thu Mar 08 2007 - Orion Poplawski <orion at cora.nwra.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
+* Fri Dec 22 2006 - Orion Poplawski <orion at cora.nwra.com> - 2.4.4-5
 - Fix .so permissions
 - Patch for const issue
 - Patch for new cmake
@@ -398,43 +406,43 @@
 * Thu Dec 14 2006 - Jef Spaleta <jspaleta at gmail.com> - 2.4.4-4
 - Bump and build for python 2.5
 
-* Fri Oct  6 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-3
+* Fri Oct  6 2006 - Orion Poplawski <orion at cora.nwra.com> - 2.4.4-3
 - Install needed python libraries to get around make install bug
 
-* Wed Oct  4 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-2
+* Wed Oct  4 2006 - Orion Poplawski <orion at cora.nwra.com> - 2.4.4-2
 - Re-enable OSMESA support for FC6
 - Enable python wrapping
 
-* Fri Sep 15 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.4-1
+* Fri Sep 15 2006 - Orion Poplawski <orion at cora.nwra.com> - 2.4.4-1
 - Update to 2.4.4
 
-* Thu Jun 29 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-8
+* Thu Jun 29 2006 - Orion Poplawski <orion at cora.nwra.com> - 2.4.3-8
 - No OSMesa support in FC5
 - Make data sub-package pull in main package (bug #193837)
 - A patch from CVS to fix vtkXOpenRenderWindow.cxx
 - Need lam-devel for FC6
 
-* Fri Apr 21 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-7
+* Fri Apr 21 2006 - Orion Poplawski <orion at cora.nwra.com> - 2.4.3-7
 - Re-enable ppc
 
-* Mon Apr 17 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-6
+* Mon Apr 17 2006 - Orion Poplawski <orion at cora.nwra.com> - 2.4.3-6
 - Exclude ppc due to gcc bug #189160
 
-* Wed Apr 12 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-5
+* Wed Apr 12 2006 - Orion Poplawski <orion at cora.nwra.com> - 2.4.3-5
 - Cleanup permissions
 
-* Mon Apr 10 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-4
+* Mon Apr 10 2006 - Orion Poplawski <orion at cora.nwra.com> - 2.4.3-4
 - Add icon and cleanup desktop file
 
-* Mon Apr 10 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-3
+* Mon Apr 10 2006 - Orion Poplawski <orion at cora.nwra.com> - 2.4.3-3
 - Add VTK_USE_MANGLE_MESA for off screen rendering
 - Cleanup source permisions
 - Add an initial .desktop file
 - Make requirement on -data specific to version
 - Don't package Ice-T man pages and cmake files
 
-* Thu Apr  6 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-2
+* Thu Apr  6 2006 - Orion Poplawski <orion at cora.nwra.com> - 2.4.3-2
 - Add mpi version
 
-* Tue Apr  4 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-1
+* Tue Apr  4 2006 - Orion Poplawski <orion at cora.nwra.com> - 2.4.3-1
 - Initial Fedora Extras version

More information about the fedora-extras-commits mailing list