[paraview] Don't ship vtkWrapHierarchy, conflicts with vtk (Bug 831834)
Orion Poplawski
orion at fedoraproject.org
Wed Jun 13 21:08:16 UTC 2012
commit e2c031b03ba9c98b6ecfcbabd25f99111d4f6a1c
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Wed Jun 13 15:08:13 2012 -0600
Don't ship vtkWrapHierarchy, conflicts with vtk (Bug 831834)
paraview.spec | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/paraview.spec b/paraview.spec
index 0064604..f1adf60 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -13,7 +13,7 @@
Name: paraview
Version: %{pv_majmin}.%{pv_patch}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Parallel visualization application
Group: Applications/Engineering
@@ -388,7 +388,7 @@ mv $RPM_BUILD_ROOT%{_libdir}/paraview/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/pa
mv $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/vtkPV*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/
#Cleanup vtk conflicting binaries
-rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,WrapPython,WrapPythonInit}
+rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,WrapHierarchy,WrapPython,WrapPythonInit}
popd
@@ -441,7 +441,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%files devel
%{_bindir}/kwProcessXML
%{_bindir}/vtkWrapClientServer
-%{_bindir}/vtkWrapHierarchy
%{_includedir}/paraview/
%{_datadir}/doc/paraview-%{pv_majmin}/
@@ -477,6 +476,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
+* Wed Jun 13 2012 Orion Poplawski <orion at cora.nwra.com> - 3.14.1-3
+- Don't ship vtkWrapHierarchy, conflicts with vtk (Bug 831834)
+
* Tue May 15 2012 Orion Poplawski <orion at cora.nwra.com> - 3.14.1-2
- Rebuild with hdf5 1.8.9
More information about the scm-commits
mailing list