From 0fbc3afe863fb87e2f6b23f7ab0aadbf1376a539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 22 Mar 2023 19:31:51 +0100 Subject: [PATCH] Do not conditionalize Sources See https://docs.fedoraproject.org/en-US/packaging-guidelines/SourceURL/#_do_not_conditionalize_sources Specific reason: centpkg sources/rhpkg sources does not set the %rhel macro when parsing the spec to determine what sources it wants to skip. Hence would always skip downloading the rhel-8-conditionalized source unless it runs on a RHEL 8 system. See: [python3.11-pip (c8s)]$ centpkg sources Not downloading unused pip-22.3.1-man.tar.gz Downloading pip-22.3.1.tar.gz ######################################################################## 100.0% This has been reported to centpkg in https://git.centos.org/centos/centpkg/issue/71 but it might not be trivial to fix, because rpkg does not currently need to have a valid branch/--release to download sources at all. Considering this is forbidden in the Fedora guidelines and problematic on the Zuul CI https://issues.redhat.com/browse/CS-1501 we better remove the conditional. It has no value in a RHEL-8 specific spec file anyway. --- This fix is not specifically related to the issue mentioned bellow, but it was added when working on it and the check-gitbz pipeline requires this note: Related: RHEL-231 --- python3.11-pip.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python3.11-pip.spec b/python3.11-pip.spec index 88a3df6..3980fc1 100644 --- a/python3.11-pip.spec +++ b/python3.11-pip.spec @@ -48,7 +48,7 @@ Summary: A tool for installing and managing Python packages License: MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD) URL: https://pip.pypa.io/ Source0: https://github.com/pypa/pip/archive/%{upstream_version}/%{srcname}-%{upstream_version}.tar.gz -%if 0%{?rhel} == 8 + # To generate the man pages for RHEL8 on a system with Python >= 3.7 # rhpkg prep # cd into the pip folder @@ -57,7 +57,7 @@ Source0: https://github.com/pypa/pip/archive/%{upstream_version}/%{srcnam # tar -czf pip-22.3.1-man.tar.gz --exclude=".[^/]*" -v docs/build/man # mv pip-22.3.1-man.tar.gz .. Source1: pip-%{base_version}-man.tar.gz -%endif #rhel8 + BuildArch: noarch # Prevent removing of the system packages installed under /usr/lib