From 9c3d2b9985db694627acfe45495634e5ebecee91 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Thu, 3 Dec 2020 17:58:56 +0800
Subject: [PATCH 1/3] [patch tracking] 20201203175849753936 -
 https://github.com/pypa/pip/commit/5dde00ab68612109dbaa087a4cb017939246659a

---
 ...00ab68612109dbaa087a4cb017939246659a.patch | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 5dde00ab68612109dbaa087a4cb017939246659a.patch

diff --git a/5dde00ab68612109dbaa087a4cb017939246659a.patch b/5dde00ab68612109dbaa087a4cb017939246659a.patch
new file mode 100644
index 0000000..4c02edb
--- /dev/null
+++ b/5dde00ab68612109dbaa087a4cb017939246659a.patch
@@ -0,0 +1,29 @@
+diff --git a/NEWS.rst b/NEWS.rst
+index feff159190..71071a4c08 100644
+--- a/NEWS.rst
++++ b/NEWS.rst
+@@ -9,6 +9,16 @@
+ 
+ .. towncrier release notes start
+ 
++20.3.1 (2020-12-03)
++===================
++
++Deprecations and Removals
++-------------------------
++
++- The --build-dir option has been restored as a no-op, to soften the transition
++  for tools that still used it. (`#9193 <https://github.com/pypa/pip/issues/9193>`_)
++
++
+ 20.3 (2020-11-30)
+ =================
+ 
+diff --git a/news/9193.removal.rst b/news/9193.removal.rst
+deleted file mode 100644
+index 5957a55836..0000000000
+--- a/news/9193.removal.rst
++++ /dev/null
+@@ -1,2 +0,0 @@
+-The --build-dir option has been restored as a no-op, to soften the transition
+-for tools that still used it.
-- 
Gitee


From e56b09a40cde7b0c064a71a52a148cbbd71084af Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Thu, 3 Dec 2020 17:58:56 +0800
Subject: [PATCH 2/3] [patch tracking] 20201203175849753936 -
 https://github.com/pypa/pip/commit/e6da461a1d9803763e8a9a5fcf488508d4d1d22f

---
 ...461a1d9803763e8a9a5fcf488508d4d1d22f.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 e6da461a1d9803763e8a9a5fcf488508d4d1d22f.patch

diff --git a/e6da461a1d9803763e8a9a5fcf488508d4d1d22f.patch b/e6da461a1d9803763e8a9a5fcf488508d4d1d22f.patch
new file mode 100644
index 0000000..5e93d6e
--- /dev/null
+++ b/e6da461a1d9803763e8a9a5fcf488508d4d1d22f.patch
@@ -0,0 +1,32 @@
+diff --git a/.mailmap b/.mailmap
+index 63d292348d..29f9ec039b 100644
+--- a/.mailmap
++++ b/.mailmap
+@@ -20,7 +20,6 @@ Dustin Ingram       <di@di.codes>                           <di@users.noreply.gi
+ Endoh Takanao                                               <djmchl@gmail.com>
+ Erik M. Bray                                                <embray@stsci.edu>
+ Gabriel de Perthuis                                         <g2p.code@gmail.com>
+-Geoffrey Lehée                                              <geoffrey@lehee.name>
+ Hsiaoming Yang                                              <lepture@me.com>
+ Igor Kuzmitshov     <kuzmiigo@gmail.com>                    <igor@qubit.com>
+ Ilya Baryshev                                               <baryshev@gmail.com>
+diff --git a/AUTHORS.txt b/AUTHORS.txt
+index 7ab324ce42..5b53db6c2b 100644
+--- a/AUTHORS.txt
++++ b/AUTHORS.txt
+@@ -218,7 +218,6 @@ Gabriel Curio
+ Gabriel de Perthuis
+ Garry Polley
+ gdanielson
+-Geoffrey Lehée
+ Geoffrey Sneddon
+ George Song
+ Georgi Valkov
+@@ -551,6 +550,7 @@ Tony Zhaocheng Tan
+ TonyBeswick
+ toonarmycaptain
+ Toshio Kuratomi
++toxinu
+ Travis Swicegood
+ Tzu-ping Chung
+ Valentin Haenel
-- 
Gitee


From deb8479626d33f19297469c0838650ed734f1f21 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Thu, 3 Dec 2020 17:58:57 +0800
Subject: [PATCH 3/3] [patch tracking] 20201203175849753936 - update spec file

---
 python-pip.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/python-pip.spec b/python-pip.spec
index 3d035b5..53cec23 100644
--- a/python-pip.spec
+++ b/python-pip.spec
@@ -6,7 +6,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:        3
+Release:        4
 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
@@ -16,6 +16,8 @@ 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: 5dde00ab68612109dbaa087a4cb017939246659a.patch
+Patch6002: e6da461a1d9803763e8a9a5fcf488508d4d1d22f.patch
 Source10: 	pip-allow-older-versions.patch
 
 %description %{_description}
@@ -112,6 +114,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
 %{python_wheeldir}/%{python_wheelname}
 
 %changelog
+* 20201203175849753936 patch-tracking 20.2.2-4
+- append patch file of upstream repository from <5dde00ab68612109dbaa087a4cb017939246659a> to <e6da461a1d9803763e8a9a5fcf488508d4d1d22f>
+
 * Wed Nov 4 2020 wangjie<wangjie294@huawei.com> -20.2.2-3
 - Type:NA
 - ID:NA
@@ -161,4 +166,4 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
 - DESC:  Synchronize a patch
 
 * Mon Sep 23 2019 openEuler Buildteam <buildteam@openeuler.org> - 18.0-6
-- Package init
+- Package init
\ No newline at end of file
-- 
Gitee