[paraview/f18] - Remove only vtk conflicting binaries (bug #915116) - Do not move python libraries

[Orion Poplawski]

commit 09a9a58c55ec2ca016a2124cd518dfd4e092738e
Author: Orion Poplawski <orion at nwra.com>
Date:   Mon Feb 25 17:26:45 2013 -0700

    - Remove only vtk conflicting binaries (bug #915116)
    - Do not move python libraries

 paraview.spec |   59 ++++++++++----------------------------------------------
 1 files changed, 11 insertions(+), 48 deletions(-)
---
diff --git a/paraview.spec b/paraview.spec
index 28b65db..e62d0fc 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
@@ -311,23 +311,8 @@ install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/mime/packages
 pushd fedora-openmpi
 make install DESTDIR=$RPM_BUILD_ROOT
 
-#Cleanup %{_bindir}
-pushd $RPM_BUILD_ROOT%{_libdir}/openmpi/bin
-#Don't need mpi versions of these
-rm paraview pvblot pvpython vtk*
-#Move the remaining mpi binaries out of the way
-for f in pvbatch pvdataserver pvrenderserver pvserver smTestDriver
-do
-   mv $f ${f}_openmpi
-done
-popd
-
 #Remove mpi copy of doc and man pages
 rm -rf $RPM_BUILD_ROOT%{_libdir}/openmpi/share/{doc,man}
-
-#Install vtk*Python.so by hand for now
-mv $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/site-packages/paraview/vtk/
-mv $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/site-packages/paraview/vtk/vtkPV*Python.so $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/site-packages/paraview/
 popd
 %endif
 
@@ -336,23 +321,8 @@ popd
 pushd fedora-mpich2
 make install DESTDIR=$RPM_BUILD_ROOT
 
-#Cleanup %{_bindir}
-pushd $RPM_BUILD_ROOT%{_libdir}/mpich2/bin
-#Don't need mpi versions of these
-rm paraview pvblot pvpython vtk*
-#Move the remaining mpi binaries out of the way
-for f in pvbatch pvdataserver pvrenderserver pvserver smTestDriver
-do
-   mv $f ${f}_mpich2
-done
-popd
-
 #Remove mpi copy of doc and man pages
 rm -rf $RPM_BUILD_ROOT%{_libdir}/mpich2/share/{doc,man}
-
-#Install vtk*Python.so by hand for now
-mv $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/site-packages/paraview/vtk/
-mv $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/site-packages/paraview/vtk/vtkPV*Python.so $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/site-packages/paraview/
 popd
 %endif
 
@@ -380,12 +350,8 @@ desktop-file-install --vendor=fedora \
        --dir %{buildroot}%{_datadir}/applications/ \
        paraview.desktop
 
-#Install vtk*Python.so by hand for now
-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 only vtk conflicting binaries
-rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,HashSource,Parse{Java,OGLExt},ProcessShader,Wrap{Hierarchy,Java,Python,Tcl,TclInit,PythonInit}}
+rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,ParseJava,Wrap{Hierarchy,Java,Python,Tcl}}*
 popd
 
 
@@ -436,8 +402,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/mime/packages/paraview.xml
 
 %files devel
-%{_bindir}/vtkkwProcessXML
-%{_bindir}/vtkWrapClientServer
+%{_bindir}/vtk*
 %{_includedir}/paraview/
 %{_datadir}/cmake/
 %{_datadir}/doc/paraview-%{pv_majmin}/
@@ -446,14 +411,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %if %{build_openmpi}
 %files openmpi
 %doc License_v1.2.txt
-%{_libdir}/openmpi/bin/pvbatch_openmpi
-%{_libdir}/openmpi/bin/pvdataserver_openmpi
-%{_libdir}/openmpi/bin/pvrenderserver_openmpi
-%{_libdir}/openmpi/bin/pvserver_openmpi
-%{_libdir}/openmpi/bin/smTestDriver_openmpi
+%{_libdir}/openmpi/bin/[ps]*
 %{_libdir}/openmpi/lib/paraview/
 
 %files openmpi-devel
+%{_libdir}/openmpi/bin/vtk*
 %{_libdir}/openmpi/include/paraview/
 %{_libdir}/openmpi/share/cmake/
 %endif
@@ -462,20 +424,21 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %if %{build_mpich2}
 %files mpich2
 %doc License_v1.2.txt
-%{_libdir}/mpich2/bin/pvbatch_mpich2
-%{_libdir}/mpich2/bin/pvdataserver_mpich2
-%{_libdir}/mpich2/bin/pvrenderserver_mpich2
-%{_libdir}/mpich2/bin/pvserver_mpich2
-%{_libdir}/mpich2/bin/smTestDriver_mpich2
+%{_libdir}/mpich2/bin/[ps]*
 %{_libdir}/mpich2/lib/paraview/
 
 %files mpich2-devel
+%{_libdir}/mpich2/bin/vtk*
 %{_libdir}/mpich2/include/paraview/
 %{_libdir}/mpich2/share/cmake/
 %endif
 
 
 %changelog
+* Sun Feb 24 2013 Orion Poplawski <orion at cora.nwra.com> - 3.98.1-2
+- Remove only vtk conflicting binaries (bug #915116)
+- Do not move python libraries
+
 * Wed Feb 20 2013 Orion Poplawski <orion at cora.nwra.com> - 3.98.1-1
 - Update to 3.98.1
 - Drop pvblot patch