From 56fd2941b0ffb474b6f9bd6d9f17119593e72bb3 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Sep 14 2016 08:57:26 +0000 Subject: Ensure that python3-os-testr don't pull python2 in Fedora Change-Id: Ifac98ac4deb5698d34940300bb6499a4ba607f3e (cherry picked from commit 34d1f7e39cc5cd704b77c3a3a96d2635ea3fd5e7) --- diff --git a/python-os-testr.spec b/python-os-testr.spec index 25feb31..464c041 100644 --- a/python-os-testr.spec +++ b/python-os-testr.spec @@ -101,16 +101,14 @@ popd %endif %install -%if 0%{?with_python3} -pushd python3 -%{__python3} setup.py install --skip-build --root=$RPM_BUILD_ROOT -for file in $RPM_BUILD_ROOT%{python3_sitelib}/os_testr/{subunit_trace,ostestr,subunit2html}.py;do +pushd python2 +%{__python2} setup.py install --skip-build --root=$RPM_BUILD_ROOT +for file in $RPM_BUILD_ROOT%{python2_sitelib}/os_testr/{subunit_trace,ostestr,subunit2html}.py; do chmod a+x $file done export PYTHONPATH="$( pwd ):$PYTHONPATH" pushd doc -sphinx-build-3 -b html -d build/doctrees source build/html - +sphinx-build -b html -d build/doctrees source build/html # Fix hidden-file-or-dir warnings rm -fr build/html/.buildinfo @@ -118,16 +116,17 @@ rm -fr build/html/.buildinfo sed -i "s|\r||g" build/html/_static/jquery.js popd popd -%endif -pushd python2 -%{__python2} setup.py install --skip-build --root=$RPM_BUILD_ROOT -for file in $RPM_BUILD_ROOT%{python2_sitelib}/os_testr/{subunit_trace,ostestr,subunit2html}.py; do +%if 0%{?with_python3} +pushd python3 +%{__python3} setup.py install --skip-build --root=$RPM_BUILD_ROOT +for file in $RPM_BUILD_ROOT%{python3_sitelib}/os_testr/{subunit_trace,ostestr,subunit2html}.py;do chmod a+x $file done export PYTHONPATH="$( pwd ):$PYTHONPATH" pushd doc -sphinx-build -b html -d build/doctrees source build/html +sphinx-build-3 -b html -d build/doctrees source build/html + # Fix hidden-file-or-dir warnings rm -fr build/html/.buildinfo @@ -135,14 +134,18 @@ rm -fr build/html/.buildinfo sed -i "s|\r||g" build/html/_static/jquery.js popd popd +%endif + %files %doc README.rst %license LICENSE +%if ! 0%{?with_python3} %{_bindir}/generate-subunit %{_bindir}/ostestr %{_bindir}/subunit-trace %{_bindir}/subunit2html +%endif %{python2_sitelib}/os_testr %{python2_sitelib}/os_testr-*.egg-info