diff --git a/gpaw.spec b/gpaw.spec index 6f99ae3..f85ccb2 100644 --- a/gpaw.spec +++ b/gpaw.spec @@ -20,7 +20,7 @@ ExcludeArch: ppc64 Name: gpaw Version: 1.4.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A grid-based real-space PAW method DFT code License: GPLv3+ @@ -349,6 +349,10 @@ done for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw-runscript3; do sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/python3|g' $f done +# Make sure number occurs only once +for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw{,-analyse-basis,-upfplot,-runscript,-mpisim,-setup,-basis,-plot-parallel-timings,-runscript}3; do + sed -i 's|^#!%{_bindir}/python33|#!%{_bindir}/python3|g' $f +done %endif for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw{,-analyse-basis,-upfplot,-runscript,-mpisim,-setup,-basis,-plot-parallel-timings}; do sed -i 's|^#!/usr/bin/env python|#!%{_bindir}/python2|g' $f @@ -356,7 +360,10 @@ done for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw-runscript; do sed -i 's|^#!/usr/bin/env gpaw-python|#!%{_bindir}/python2|g' $f done - +# Make sure number occurs only once +for f in ${RPM_BUILD_ROOT}%{_bindir}/gpaw{,-analyse-basis,-upfplot,-runscript,-mpisim,-setup,-basis,-plot-parallel-timings,-runscript}; do + sed -i 's|^#!%{_bindir}/python22|#!%{_bindir}/python2|g' $f +done mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} %check @@ -450,6 +457,9 @@ popd %changelog +* Sun Dec 23 2018 Susi Lehtola - 1.4.0-8 +- Still a problem for python2 in previous commit. + * Sun Dec 23 2018 Susi Lehtola - 1.4.0-7 - Switch to openblas on s390x as well. - Fix shebangs (BZ #1661785).