[paraview/f15] Revert the boost patch
Orion Poplawski
orion at fedoraproject.org
Fri Dec 16 21:48:34 UTC 2011
commit 1895bf51de4003d3dd8dc4dc251568e5bd585dfb
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Fri Dec 16 14:48:34 2011 -0700
Revert the boost patch
paraview-3.12.0-boost-1.48.0-bfs.patch | 31 -------------------------------
paraview.spec | 11 ++---------
2 files changed, 2 insertions(+), 40 deletions(-)
---
diff --git a/paraview.spec b/paraview.spec
index d6e7c43..cd769a1 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -13,7 +13,7 @@
Name: paraview
Version: %{pv_majmin}.%{pv_patch}
-Release: 4%{?dist}
+Release: 3%{?dist}
Summary: Parallel visualization application
Group: Applications/Engineering
@@ -24,9 +24,6 @@ Source1: paraview_22x22.png
Source2: paraview.xml
#Add some needed includes
Patch1: paraview-3.8.0-include.patch
-#Patch to build with boost 1.48
-#Reported upstream: http://paraview.org/Bug/view.php?id=12772
-Patch2: paraview-3.12.0-boost-1.48.0-bfs.patch
#Reported upstream: http://public.kitware.com/mantis/view.php?id=7023
Patch7: paraview-3.2.2-hdf5.patch
@@ -221,7 +218,6 @@ developing applications that use %{name}-mpich2.
%prep
%setup -q -n ParaView-%{version}%{?rcver}
%patch1 -p1 -b .include
-%patch2 -p1 -b .boost
%patch7 -p1 -b .hdf5
#Remove included hdf5 just to be sure
rm -r VTK/Utilities/vtkhdf5
@@ -458,12 +454,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
-* Mon Dec 12 2011 Orion Poplawski <orion at cora.nwra.com> - 3.12.0-4
+* Mon Dec 12 2011 Orion Poplawski <orion at cora.nwra.com> - 3.12.0-3
- Install more libvtk libraries by hand and manually remove rpath
-* Fri Dec 9 2011 Orion Poplawski <orion at cora.nwra.com> - 3.12.0-3
-- Add patch from Petr Machata to build with boost 1.48.0
-
* Thu Dec 1 2011 Orion Poplawski <orion at cora.nwra.com> - 3.12.0-2
- Enable PARAVIEW_INSTALL_DEVELOPMENT and re-add -devel sub-package
- Install libvtk*Python.so by hand for now
More information about the scm-commits
mailing list