From 974d0eccef1be71724c3491d9156766ce06f1eae Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Oct 12 2018 10:46:08 +0000 Subject: only point to namespaced Python 3 version of virtualenv if it's available --- diff --git a/pipsi.spec b/pipsi.spec index 01bd63b..9b23ed6 100644 --- a/pipsi.spec +++ b/pipsi.spec @@ -9,7 +9,7 @@ Name: %{pypi_name} Version: 0.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Wraps pip and virtualenv to install scripts License: BSD @@ -43,9 +43,14 @@ and each other. # Remove bundled egg-info rm -rf %{pypi_name}.egg-info -# Point to Python 3 version of virtualenv executable -sed -i '233 s/virtualenv/py3-virtualenv/' %{pypi_name}.py -sed -i '70 s/virtualenv/py3-virtualenv/' get-%{pypi_name}.py +# Point to namespaced Python 3 version of virtualenv executable if available +for cand in virtualenv-3 py3-virtualenv; do + if [ -e "%{_bindir}/$cand" ]; then + sed -i "233 s/virtualenv/$cand/" %{pypi_name}.py + sed -i "70 s/virtualenv/$cand/" get-%{pypi_name}.py + break + fi +done %build @@ -74,6 +79,10 @@ export LC_CTYPE="C.UTF-8" %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* Fri Oct 12 2018 Nils Philippsen - 0.9-10 +- only point to namespaced Python 3 version of virtualenv if it's available + (#1638088) + * Fri Jul 13 2018 Fedora Release Engineering - 0.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild @@ -99,4 +108,4 @@ export LC_CTYPE="C.UTF-8" - Disable test suite for koji builds. * Thu Apr 07 2016 Charalampos Stratakis - 0.9-1 -- Initial package. \ No newline at end of file +- Initial package.