diff --git a/octave-miscellaneous.spec b/octave-miscellaneous.spec index d74b1b9..66c1e8d 100644 --- a/octave-miscellaneous.spec +++ b/octave-miscellaneous.spec @@ -2,7 +2,7 @@ Name: octave-%{octpkg} Version: 1.2.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Miscellaneous functions for Octave Group: Applications/Engineering License: GPLv3+ @@ -13,6 +13,13 @@ BuildRequires: octave-devel BuildRequires: dos2unix BuildRequires: octave-general >= 1.3.1 BuildRequires: units +%if 0%{?fedora} >= 30 +BuildRequires: /usr/bin/2to3 +BuildRequires: python3-rpm-macros +%else +BuildRequires: python2-rpm-macros +%endif +BuildRequires: /usr/bin/pathfix.py Requires: octave(api) = %{octave_api} Requires(post): octave @@ -37,6 +44,12 @@ chmod a-x %{buildroot}/%{octpkgdir}/*.m dos2unix %{buildroot}/%{octpkgdir}/*.m chmod a-x %{buildroot}/%{octpkgdir}/private/*.m dos2unix %{buildroot}/%{octpkgdir}/private/*.m +%if 0%{?fedora} >= 30 +/usr/bin/2to3 --write --nobackups %{buildroot}%{octpkgdir} +/usr/bin/pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{octpkgdir} +%else +/usr/bin/pathfix.py -pni "%{__python2} %{py2_shbang_opts}" %{buildroot}%{octpkgdir} +%endif %post %octave_cmd pkg rebuild @@ -58,6 +71,10 @@ dos2unix %{buildroot}/%{octpkgdir}/private/*.m %doc %{octpkgdir}/packinfo/COPYING %changelog +* Wed Nov 14 2018 Orion Poplawski - 1.2.1-13 +- Rebuild for octave 4.4 +- Use Python 3 on Fedora 30+ + * Fri Jul 13 2018 Fedora Release Engineering - 1.2.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild