From d6c8a926ddbbc8977e9a3af26307ad4fc60e06cf Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Thu, 29 Oct 2020 07:30:12 +0800 Subject: [PATCH 1/2] [patch tracking] 20201029073007637383 - https://github.com/pypa/pip/commit/92f9e77127a28b996e8f9dc1168a55fce6ef43e5 --- 92f9e77127a28b996e8f9dc1168a55fce6ef43e5.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 92f9e77127a28b996e8f9dc1168a55fce6ef43e5.patch diff --git a/92f9e77127a28b996e8f9dc1168a55fce6ef43e5.patch b/92f9e77127a28b996e8f9dc1168a55fce6ef43e5.patch new file mode 100644 index 0000000..05437fe --- /dev/null +++ b/92f9e77127a28b996e8f9dc1168a55fce6ef43e5.patch @@ -0,0 +1,13 @@ +diff --git a/docs/html/development/contributing.rst b/docs/html/development/contributing.rst +index 3cdbb309d4..63eb4c33ee 100644 +--- a/docs/html/development/contributing.rst ++++ b/docs/html/development/contributing.rst +@@ -112,7 +112,7 @@ as trivial a contributor simply needs to add a randomly named, empty file to + the ``news/`` directory with the extension of ``.trivial.rst``. If you are on a + POSIX like operating system, one can be added by running + ``touch news/$(uuidgen).trivial.rst``. On Windows, the same result can be +-achieved in Powershell using ``New-Item "news/$([guid]::NewGuid()).trivial"``. ++achieved in Powershell using ``New-Item "news/$([guid]::NewGuid()).trivial.rst"``. + Core committers may also add a "trivial" label to the PR which will accomplish + the same thing. + -- Gitee From f042e8bed3e07b35d3aebf79f1b4b921ecc0bf8c Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Thu, 29 Oct 2020 07:30:12 +0800 Subject: [PATCH 2/2] [patch tracking] 20201029073007637383 - 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..0e4f367 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: 92f9e77127a28b996e8f9dc1168a55fce6ef43e5.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 +* 20201029073007637383 patch-tracking 20.2.2-3 +- append patch file of upstream repository from <92f9e77127a28b996e8f9dc1168a55fce6ef43e5> to <92f9e77127a28b996e8f9dc1168a55fce6ef43e5> + * 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