[paraview/f17] Only remove vtk conflicting binaries (bug #807756)
Orion Poplawski
orion at fedoraproject.org
Thu Mar 29 14:52:53 UTC 2012
commit fea2f794acf52b714bb429337f3bf33c439ae3e8
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Thu Mar 29 08:52:50 2012 -0600
Only remove vtk conflicting binaries (bug #807756)
paraview.spec | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/paraview.spec b/paraview.spec
index 95ac68a..78907fc 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
@@ -380,8 +380,8 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}/Python
mv $RPM_BUILD_ROOT%{_libdir}/paraview/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/
mv $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/vtkPV*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/
-#Cleanup vtk binaries
-rm $RPM_BUILD_ROOT%{_bindir}/vtk*
+#Cleanup vtk conflicting binaries
+rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,WrapPython,WrapPythonInit}
popd
@@ -433,6 +433,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%files devel
%{_bindir}/kwProcessXML
+%{_bindir}/vtkWrapClientServer
+%{_bindir}/vtkWrapHierarchy
%{_includedir}/paraview/
%{_datadir}/doc/paraview-%{pv_majmin}/
@@ -468,6 +470,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
+* Thu Mar 29 2012 Orion Poplawski <orion at cora.nwra.com> - 3.14.0-3
+- Only remove vtk conflicting binaries (bug #807756)
+
* Wed Feb 29 2012 Orion Poplawski <orion at cora.nwra.com> - 3.14.0-2
- Add patch to make vtk use system libraries
More information about the scm-commits
mailing list