[paraview] Remove conflicts with vtk-devel (bug #1018432)

Orion Poplawski orion at fedoraproject.org
Tue Oct 15 21:04:12 UTC 2013


commit e07efa4eb71b4f28f0381cce5489003a0a03799e
Author: Orion Poplawski <orion at nwra.com>
Date:   Tue Oct 15 15:04:11 2013 -0600

    Remove conflicts with vtk-devel (bug #1018432)

 paraview.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/paraview.spec b/paraview.spec
index 3b1c6ab..f8cc9ca 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -13,7 +13,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -369,7 +369,7 @@ desktop-file-install \
        paraview.desktop
 
 #Cleanup only vtk conflicting binaries
-rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,ParseJava,Wrap{Hierarchy,Java,Python,Tcl}}*
+rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,HashSource,Parse{Java,OGLExt},ProcessShader,Wrap{Hierarchy,Java,Python,Tcl}}*
 popd
 
 # Strip build dir from VTKConfig.cmake (bug #917425)
@@ -424,7 +424,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/mime/packages/paraview.xml
 
 %files devel
-%{_bindir}/vtk*
+%{_bindir}/vtkWrapClientServer
+%{_bindir}/vtkkwProcessXML
 %{_includedir}/paraview/
 %{_datadir}/cmake/
 %{_datadir}/doc/paraview-%{pv_majmin}/
@@ -457,6 +458,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon Oct 14 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-2
+- Remove conflicts with vtk-devel (bug #1018432)
+
 * Mon Aug 12 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-1
 - Update to 4.0.1
 - Drop jpeg patch fixed upstream


More information about the scm-commits mailing list