[paraview] Install libvtk*Python.so by hand for now

Orion Poplawski orion at fedoraproject.org
Fri Dec 2 03:30:56 UTC 2011


commit f798716113f89e2ce1c79b7f82fa7e46858e247f
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Dec 1 20:26:55 2011 -0700

    Install libvtk*Python.so by hand for now

 paraview.spec |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/paraview.spec b/paraview.spec
index 4314d9d..0df4d16 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -261,7 +261,7 @@ pushd fedora-openmpi
 make install DESTDIR=$RPM_BUILD_ROOT
 
 #Cleanup %{_bindir}
-pushd $RPM_BUILD_ROOT/%{_libdir}/openmpi/bin
+pushd $RPM_BUILD_ROOT%{_libdir}/openmpi/bin
 #Don't need mpi versions of these
 rm paraview pvblot pvpython
 #Move the remaining mpi binaries out of the way
@@ -272,8 +272,11 @@ done
 popd
 
 #Remove mpi copy of includes, man pages, and documentation
-rm -rf $RPM_BUILD_ROOT/%{_includedir}/paraview-%{pv_majmin}
+rm -rf $RPM_BUILD_ROOT%{_includedir}/paraview-%{pv_majmin}
 rm -rf $RPM_BUILD_ROOT%{_mandir}
+
+#Install libvtk*Python.so by hand for now
+cp -p bin/libvtk*Python.so $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/
 popd
 %endif
 
@@ -283,7 +286,7 @@ pushd fedora-mpich2
 make install DESTDIR=$RPM_BUILD_ROOT
 
 #Cleanup %{_bindir}
-pushd $RPM_BUILD_ROOT/%{_libdir}/mpich2/bin
+pushd $RPM_BUILD_ROOT%{_libdir}/mpich2/bin
 #Don't need mpi versions of these
 rm paraview pvblot pvpython
 #Move the remaining mpi binaries out of the way
@@ -294,8 +297,11 @@ done
 popd
 
 #Remove mpi copy of includes, man pages, and documentation
-rm -rf $RPM_BUILD_ROOT/%{_includedir}/paraview-%{pv_majmin}
+rm -rf $RPM_BUILD_ROOT%{_includedir}/paraview-%{pv_majmin}
 rm -rf $RPM_BUILD_ROOT%{_mandir}
+
+#Install libvtk*Python.so by hand for now
+cp -p bin/libvtk*Python.so $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/
 popd
 %endif
 
@@ -322,6 +328,9 @@ desktop-file-install --vendor=fedora \
        --add-category=X-Fedora \
        --dir %{buildroot}%{_datadir}/applications/ \
        paraview.desktop
+
+#Install libvtk*Python.so by hand for now
+cp -p bin/libvtk*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/
 popd
 
 
@@ -404,6 +413,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %changelog
 * 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
 
 * Thu Nov 10 2011 Orion Poplawski <orion at cora.nwra.com> - 3.12.0-1
 - Update to 3.12.0


More information about the scm-commits mailing list