From 8a2dfcd2f343f855bfe44cb9db1c45e02e3e832a Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 27 Oct 2020 07:30:12 +0800 Subject: [PATCH 1/2] [patch tracking] 20201027073007637630 - https://github.com/pypa/pip/commit/c15f8672ecc6c02204b025c1c6892c12861b6d38 --- c15f8672ecc6c02204b025c1c6892c12861b6d38.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 c15f8672ecc6c02204b025c1c6892c12861b6d38.patch diff --git a/c15f8672ecc6c02204b025c1c6892c12861b6d38.patch b/c15f8672ecc6c02204b025c1c6892c12861b6d38.patch new file mode 100644 index 0000000..adc2a80 --- /dev/null +++ b/c15f8672ecc6c02204b025c1c6892c12861b6d38.patch @@ -0,0 +1,15 @@ +diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst +index 3c9cfec631..0e0f6cd3e3 100644 +--- a/docs/html/user_guide.rst ++++ b/docs/html/user_guide.rst +@@ -622,8 +622,8 @@ which can be written on multiple lines: + http://mirror2.example.com + + trusted-host = +- http://mirror1.example.com +- http://mirror2.example.com ++ mirror1.example.com ++ mirror2.example.com + + This enables users to add additional values in the order of entry for such command line arguments. + -- Gitee From af1a98f815d24e83fbfbc879f71d3602048db9f9 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 27 Oct 2020 07:30:13 +0800 Subject: [PATCH 2/2] [patch tracking] 20201027073007637630 - update spec file --- python-pip.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 05f810a..f8530d5 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -7,7 +7,7 @@ pip is the package installer for Python. You can use pip to install packages fro %global bashcompdir %(b=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null); echo ${b:-%{_sysconfdir}/bash_completion.d}) Name: python-%{srcname} Version: 20.2.2 -Release: 2 +Release: 3 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: http://www.pip-installer.org @@ -17,6 +17,7 @@ Patch1: allow-stripping-given-prefix-from-wheel-RECORD-files.patch Patch2: emit-a-warning-when-running-with-root-privileges.patch Patch3: remove-existing-dist-only-if-path-conflicts.patch Patch6000: dummy-certifi.patch +Patch6001: c15f8672ecc6c02204b025c1c6892c12861b6d38.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -140,6 +141,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201027073007637630 patch-tracking 20.2.2-3 +- append patch file of upstream repository from to + * Tue Sep 1 2020 wenzhanli - 20.2.2-2 - add pip-allow-older-versions.patch @@ -183,4 +187,4 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} - DESC: Synchronize a patch * Mon Sep 23 2019 openEuler Buildteam - 18.0-6 -- Package init +- Package init \ No newline at end of file -- Gitee