diff --git a/paraview.spec b/paraview.spec index 40dbe52..d6e7c43 100644 --- a/paraview.spec +++ b/paraview.spec @@ -13,7 +13,7 @@ Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 2%{?dist} +Release: 4%{?dist} Summary: Parallel visualization application Group: Applications/Engineering @@ -56,6 +56,7 @@ BuildRequires: boost-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtheora-devel +BuildRequires: chrpath Requires: hdf5 = %{_hdf5_version} Requires: %{name}-data = %{version}-%{release} Requires: %{name}-doc = %{version}-%{release} @@ -311,7 +312,8 @@ popd 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/ +cp -p bin/libvtk*Python*.so bin/libvtk{my,Local}*.so $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/ +chrpath -d $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/libvtk*.so popd %endif @@ -335,7 +337,8 @@ popd 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/ +cp -p bin/libvtk*Python*.so bin/libvtk{my,Local}*.so $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/ +chrpath -d $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/libvtk*.so popd %endif @@ -364,7 +367,8 @@ desktop-file-install --vendor=fedora \ paraview.desktop #Install libvtk*Python.so by hand for now -cp -p bin/libvtk*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/ +cp -p bin/libvtk*Python*.so bin/libvtk{my,Local}*.so $RPM_BUILD_ROOT%{_libdir}/paraview/ +chrpath -d $RPM_BUILD_ROOT%{_libdir}/paraview/libvtk*.so #Cleanup vtk binaries rm $RPM_BUILD_ROOT%{_bindir}/vtk* @@ -454,6 +458,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Mon Dec 12 2011 Orion Poplawski - 3.12.0-4 +- Install more libvtk libraries by hand and manually remove rpath + * Fri Dec 9 2011 Orion Poplawski - 3.12.0-3 - Add patch from Petr Machata to build with boost 1.48.0