From 7913cd9edfe56c12bac0c55714de5137152f06ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 6 Apr 2020 13:24:41 +0200 Subject: [PATCH] Make patches apply --without tests Some patches touch tests and we didn't include the test sources --without tests, leading to broken build. This was a long standing reoccurring problem. Now we always include and unpack tests sources, even when we don't run them. --- python-pip.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 15967ec..b5db78b 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -64,9 +64,7 @@ BuildRequires: python-wheel-wheel # git clone https://github.com/pypa/pip && cd pip # VERSION= # define the version you want # git checkout $VERSION && tar -czvf ../pip-$VERSION-tests.tar.gz tests/ -%if %{with tests} Source1: pip-%{version}-tests.tar.gz -%endif # Themes required to build the docs. %if %{with doc} @@ -239,9 +237,8 @@ A Python wheel of pip to use with venv. %prep %setup -q -n %{srcname}-%{version} -%if %{with tests} tar -xf %{SOURCE1} -%endif + %if %{with doc} pushd docs/html tar -xf %{SOURCE2} @@ -261,10 +258,8 @@ popd rm src/pip/_vendor/certifi/*.pem sed -i '/\.pem$/d' src/pip.egg-info/SOURCES.txt -%if %{with tests} # tests expect wheels in here ln -s %{python_wheeldir} tests/data/common_wheels -%endif %build