diff --git a/paraview.spec b/paraview.spec index 0728389..f3c22c0 100644 --- a/paraview.spec +++ b/paraview.spec @@ -61,7 +61,7 @@ Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 13%{?relsuf}%{?dist} +Release: 14%{?relsuf}%{?dist} Summary: Parallel visualization application License: BSD @@ -503,20 +503,39 @@ install -d %{buildroot}%{_datadir}/mime/packages install -m644 %SOURCE1 %{buildroot}%{_datadir}/mime/packages %if %{build_openmpi} +%{_openmpi_load} + # Install openmpi version %make_install -C %{_target_platform}-openmpi - #Remove mpi copy of doc and man pages and data rm -rf %{buildroot}%{_libdir}/openmpi/share/{appdata,applications,doc,icons,man,paraview} + +# Fix Python2 script +sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python2}|" %{buildroot}%{_libdir}/openmpi/lib/paraview/site-packages/vtk/web/launcher.py +chmod 0755 %{buildroot}$MPI_LIB/paraview/site-packages/vtk/web/launcher.py + +# Fix shell script permissions +chmod 0755 %{buildroot}%{_libdir}/openmpi/share/cmake/paraview/pre-commit +%{_openmpi_unload} %endif %if %{build_mpich} +%{_mpich_load} + # Install mpich version %make_install -C %{_target_platform}-mpich #Remove mpi copy of doc and man pages and data rm -rf %{buildroot}%{_libdir}/mpich/share/{appdata,applications,doc,icons,man,paraview} + +# Fix Python2 script +sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python2}|" %{buildroot}%{_libdir}/mpich/lib/paraview/site-packages/vtk/web/launcher.py +chmod 0755 %{buildroot}$MPI_LIB/paraview/site-packages/vtk/web/launcher.py + +# Fix shell script permissions +chmod 0755 %{buildroot}%{_libdir}/mpich/share/cmake/paraview/pre-commit +%{_mpich_unload} %endif #Install the normal version @@ -530,6 +549,13 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata #Cleanup only vtk conflicting binaries rm %{buildroot}%{_bindir}/vtk{EncodeString,HashSource,LegacyColorMapXMLToJSON,ParseJava,Wrap{Hierarchy,Java,Python,Tcl}}* +# Fix Python2 script +sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python2}|" %{buildroot}%{_libdir}/paraview/site-packages/vtk/web/launcher.py +chmod 0755 %{buildroot}%{_libdir}/paraview/site-packages/vtk/web/launcher.py + +# Fix shell script permissions +chmod 0755 %{buildroot}%{_datadir}/cmake/paraview/pre-commit + # Strip build dir from VTKConfig.cmake (bug #917425) find %{buildroot} -name VTKConfig.cmake | xargs sed -i -e '/builddir/s/^/#/' @@ -640,6 +666,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Thu Feb 22 2018 Antonio Trande - 5.4.1-14 +- Fix Python2 scripts + * Tue Feb 20 2018 Antonio Trande - 5.4.1-13 - Enable VisitBridge support (bz#1546474) - Patched for building VisItBridge plugin