diff --git a/python-pyramid.spec b/python-pyramid.spec index 203aea0..550b4b5 100644 --- a/python-pyramid.spec +++ b/python-pyramid.spec @@ -11,7 +11,7 @@ fun, more predictable, and more productive. Name: python-%{modname} Version: 1.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} Group: Development/Libraries @@ -157,16 +157,17 @@ cp -a . %{py3dir} %build %if 0%{?with_python3} pushd %{py3dir} -%{__python3} setup.py build +%py3_build popd %endif -%{__python} setup.py build +%py2_build + %install %if 0%{?with_python3} pushd %{py3dir} -%{__python3} setup.py install --skip-build --root=%{buildroot} +%py3_install cp -r pyramid/scaffolds/alchemy %{buildroot}/%{python3_sitelib}/pyramid/scaffolds/. cp -r pyramid/scaffolds/starter %{buildroot}/%{python3_sitelib}/pyramid/scaffolds/. cp -r pyramid/scaffolds/zodb %{buildroot}/%{python3_sitelib}/pyramid/scaffolds/. @@ -180,7 +181,7 @@ done; popd %endif -%{__python} setup.py install -O1 --skip-build --root %{buildroot} +%py2_install cp -r pyramid/scaffolds/alchemy %{buildroot}/%{python_sitelib}/pyramid/scaffolds/. cp -r pyramid/scaffolds/starter %{buildroot}/%{python_sitelib}/pyramid/scaffolds/. cp -r pyramid/scaffolds/zodb %{buildroot}/%{python_sitelib}/pyramid/scaffolds/. @@ -204,7 +205,7 @@ popd %if 0%{?rhel} && 0%{?rhel} <= 6 # Tests on el6 fail for unknown reasons. %else -%{__python} setup.py test +%{__python2} setup.py test %endif %files -n python2-pyramid @@ -262,6 +263,9 @@ popd %endif %changelog +* Wed Feb 28 2018 Randy Barlow - 1.9.1-4 +- Use /usr/bin/python2 instead of /usr/bin/python when building. + * Tue Feb 27 2018 Iryna Shcherbina - 1.9.1-3 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)