.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/pip-22.3.1-man.tar.gz
-SOURCES/pip-22.3.1.tar.gz
+/pip-22.3.1.tar.gz
+/pip-22.3.1-man.tar.gz

.python3.11-pip.metadata

@@ -1,2 +0,0 @@
-f04c239feb8bc4d4517f518e2e23a4059446b67d SOURCES/pip-22.3.1-man.tar.gz
-01c1ecbae116f77fb032b81c6f1ee1fb6b4c5233 SOURCES/pip-22.3.1.tar.gz

gating.yaml

@@ -0,0 +1,7 @@
+--- !Policy
+
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plan.fmf

@@ -0,0 +1,17 @@
+execute:
+  how: tmt
+
+environment:
+  VERSION: "3.11"
+  TOX: "false"
+prepare:
+  - how: install
+    package:
+    - gcc
+    - python3.11-devel
+
+discover:
+  how: fmf
+  url: https://src.fedoraproject.org/tests/python.git
+  test:
+  - /smoke/venv

python3.11-pip.spec

@@ -48,16 +48,6 @@ 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
-# sed -i '/myst_parser/d;/sphinx_copybutton/d;/sphinx_inline_tabs/d;/sphinxcontrib.towncrier/d' docs/html/conf.py
-# sphinx-build-3 -b man  docs/man  docs/build/man  -c docs/html
-# 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
@@ -164,10 +154,8 @@ BuildRequires:  python%{python3_pkgversion}-rpm-macros
 # adds the dependency on python3-rpm-generators, so we require it manually
 # Note that the package prefix is always python3-, even if we build for 3.X
 BuildRequires:  python3-rpm-generators
-%if 0%{?rhel} == 9
 # We utilize the main Python's stack sphinx to build the manual pages
 BuildRequires:  python3-sphinx
-%endif #rhel9
 BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  bash-completion
 BuildRequires:  python%{python3_pkgversion}-wheel
@@ -195,6 +183,11 @@ BuildRequires:  python%{python3_pkgversion}-installer
 %endif
 
 
+# pip has to require explicit version of python that provides
+# filters in tarfile module (fix for CVE-2007-4559).
+Requires: python%{python3_pkgversion} >= 3.11.4-3
+
+
 # This was previously required and we keep it recommended because a lot of
 # sdists installed via pip will try to import setuptools.
 # But pip doesn't actually require setuptools.
@@ -203,16 +196,6 @@ BuildRequires:  python%{python3_pkgversion}-installer
 # Side note: pip bundles pkg_resources from setuptools for internal usage.
 Recommends:     python%{python3_pkgversion}-setuptools
 
-# Require alternatives version that implements the --keep-foreign flag
-Requires(postun): alternatives >= 1.19.1-1
-
-# python3.11 installs the alternatives master symlink to which we attach a slave
-# pip has to require explicit version of python that provides
-# filters in tarfile module (fix for CVE-2007-4559).
-Requires: python%{python3_pkgversion} >= 3.11.4-3
-Requires(post): python%{python3_pkgversion}
-Requires(postun): python%{python3_pkgversion}
-
 # Virtual provides for the packages bundled by pip:
 %{bundled %{python3_pkgversion}}
 
@@ -244,10 +227,8 @@ A Python wheel of pip to use with venv.
 # this goes together with patch4
 rm src/pip/_vendor/certifi/*.pem
 
-%if 0%{?rhel} == 9
 # Remove unneeded doc dependencies
 sed -i '/myst_parser/d;/sphinx_copybutton/d;/sphinx_inline_tabs/d;/sphinxcontrib.towncrier/d' docs/html/conf.py
-%endif #rhel9
 
 # tests expect wheels in here
 ln -s %{python_wheel_dir} tests/data/common_wheels
@@ -259,11 +240,9 @@ sed -i '/\.exe/d' setup.py
 %build
 %py3_build_wheel
 
-%if 0%{?rhel} == 9
 # Build the man pages
 export PYTHONPATH=./src/
 sphinx-build-3 -b man  docs/man  docs/build/man  -c docs/html
-%endif #rhel9
 
 %install
 # The following is similar to %%pyproject_install, but we don't have
@@ -284,9 +263,6 @@ sphinx-build-3 -b man  docs/man  docs/build/man  -c docs/html
     'pip==%{upstream_version}'
 
 # Install the man pages
-%if 0%{?rhel} == 8
-tar -xvf %{SOURCE1}
-%endif #rhel8
 pushd docs/build/man
 install -d %{buildroot}%{_mandir}/man1
 for MAN in *1; do
@@ -327,17 +303,11 @@ install -p dist/%{python_wheel_name} -t %{buildroot}%{python_wheel_dir}
 rm %{buildroot}%{_bindir}/pip
 rm %{buildroot}%{_bindir}/pip3
 
-# All ghost files controlled by alternatives need to exist for the files
-# section check to succeed
-touch %{buildroot}%{_bindir}/pip3
-touch %{buildroot}%{_bindir}/pip-3
 
 %check
-%if 0%{?rhel} == 9
 # Verify bundled provides are up to date
 %{_rpmconfigdir}/pythonbundles.py src/pip/_vendor/vendor.txt --namespace 'python%{python3_pkgversion}dist' \
     --compare-with '%{bundled %{python3_pkgversion}}'
-%endif #rhel9
 
 %if %{with tests}
 # Upstream tests
@@ -352,32 +322,6 @@ pytest_k='not completion'
     --deselect tests/functional --deselect tests/lib/test_lib.py
 %endif
 
-%post -n python%{python3_pkgversion}-%{srcname}
-alternatives --add-slave python3 %{_bindir}/python%{python3_version} \
-    %{_bindir}/pip3 \
-    pip3 \
-    %{_bindir}/pip%{python3_version}
-alternatives --add-slave python3 %{_bindir}/python%{python3_version} \
-    %{_bindir}/pip-3 \
-    pip-3 \
-    %{_bindir}/pip-%{python3_version}
-
-%postun -n python%{python3_pkgversion}-%{srcname}
-# Do this only during uninstall process (not during update)
-if [ $1 -eq 0 ]; then
-    # Only remove the slave links if the master link for python3 still exists.
-    # Due to a possible bug in yum, python3.11 gets removed before python3.11-pip
-    # even though we have declared Requires(postun): python3.11
-    EXISTS=`alternatives --display python3 | \
-          grep -c "^/usr/bin/python%{python3_version} - priority [0-9]*"`
-
-    if [ $EXISTS -ne 0 ]; then
-        alternatives --keep-foreign --remove-slave python3 %{_bindir}/python%{python3_version} \
-            pip3
-        alternatives --keep-foreign --remove-slave python3 %{_bindir}/python%{python3_version} \
-            pip-3
-    fi
-fi
 
 %files -n python%{python3_pkgversion}-%{srcname}
 %doc README.rst
@@ -391,8 +335,6 @@ fi
 %{python3_sitelib}/pip*
 %dir %{bashcompdir}
 %{bashcompdir}/pip%{python3_pkgversion}
-%ghost %{_bindir}/pip3
-%ghost %{_bindir}/pip-3
 
 %files -n %{python_wheel_pkg_prefix}-%{srcname}-wheel
 %license LICENSE.txt
@@ -403,11 +345,11 @@ fi
 %changelog
 * Wed Feb 14 2024 Tomáš Hrnčiar <thrnciar@redhat.com> - 22.3.1-5
 - Require Python with tarfile filters
-Resolves: RHEL-25453
+Resolves: RHEL-25455
 
 * Tue Aug 08 2023 Petr Viktorin <pviktori@redhat.com> - 22.3.1-4
 - Use tarfile.data_filter for extracting (CVE-2007-4559, PEP-721, PEP-706)
-Resolves: RHBZ#2218249
+Resolves: RHBZ#2218247
 
 * Mon Mar 06 2023 Lumír Balhar <lbalhar@redhat.com> - 22.3.1-3
 - Fix changelog to contain Fedora contributors

sources

@@ -0,0 +1,2 @@
+SHA512 (pip-22.3.1.tar.gz) = c7865c4ce79b0fea7ba469fe593af3be205b3bdb574a6ae019842e0f82a0af406ec905d8c6ff02fbbafe01630c8899a398d071ce74501ca830249160f2f6df98
+SHA512 (pip-22.3.1-man.tar.gz) = 6dc14a0565747e30911d23d6c618a396e30d957e6bd8d1c8248bc9e51ebebc01751b051b761e846cf0223d26a57c1bae732a004d171ba9ad18a6cc9c55a60be3