Drop py3dir, shebang sed
This commit is contained in:
parent
4e3f5f6cff
commit
b12e77defb
@ -73,21 +73,13 @@ heavily inspired by should.js.
|
|||||||
# Remove bundled egg-info
|
# Remove bundled egg-info
|
||||||
rm -rf %{pypi_name}.egg-info
|
rm -rf %{pypi_name}.egg-info
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
|
||||||
rm -rf %{py3dir}
|
|
||||||
cp -a . %{py3dir}
|
|
||||||
find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!/bin/env python|#!%{__python3}|'
|
|
||||||
%endif # with_python3
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{?scl:scl enable %{scl} "}
|
%{?scl:scl enable %{scl} "}
|
||||||
%py2_build
|
%py2_build
|
||||||
%{?scl:"}
|
%{?scl:"}
|
||||||
|
|
||||||
%if 0%{with_python3}
|
%if 0%{with_python3}
|
||||||
pushd %{py3dir}
|
%py3_build
|
||||||
LANG=en_US.utf8 %py3_build
|
|
||||||
popd
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -96,9 +88,7 @@ popd
|
|||||||
%{?scl:"}
|
%{?scl:"}
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
%if 0%{?with_python3}
|
||||||
pushd %{py3dir}
|
%py3_install
|
||||||
LANG=en_US.utf8 %py3_install
|
|
||||||
popd
|
|
||||||
%endif # with_python3
|
%endif # with_python3
|
||||||
|
|
||||||
%check
|
%check
|
||||||
@ -107,9 +97,7 @@ popd
|
|||||||
%{?scl:"}
|
%{?scl:"}
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
%if 0%{?with_python3}
|
||||||
pushd %{py3dir}
|
|
||||||
%{__python3} -m nose --verbosity 2
|
%{__python3} -m nose --verbosity 2
|
||||||
popd
|
|
||||||
%endif # with_python3
|
%endif # with_python3
|
||||||
|
|
||||||
%files -n python2-%{pypi_name}
|
%files -n python2-%{pypi_name}
|
||||||
@ -127,6 +115,8 @@ popd
|
|||||||
%changelog
|
%changelog
|
||||||
* Thu May 17 2018 Miro Hrončok <mhroncok@redhat.com> - 1.4.10-1
|
* Thu May 17 2018 Miro Hrončok <mhroncok@redhat.com> - 1.4.10-1
|
||||||
- Updated to 1.4.10 that supports Python 3.7 (#1578530)
|
- Updated to 1.4.10 that supports Python 3.7 (#1578530)
|
||||||
|
- Stop py3dir pushd/popd, it is not needed
|
||||||
|
- Removed an unneeded shebeng sed
|
||||||
|
|
||||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-5
|
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
Loading…
Reference in New Issue
Block a user