diff --git a/5dde00ab68612109dbaa087a4cb017939246659a.patch b/5dde00ab68612109dbaa087a4cb017939246659a.patch new file mode 100644 index 0000000000000000000000000000000000000000..4c02edb9eb9cab3a27ea072771f275624d25e08d --- /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 `_) ++ ++ + 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. diff --git a/e6da461a1d9803763e8a9a5fcf488508d4d1d22f.patch b/e6da461a1d9803763e8a9a5fcf488508d4d1d22f.patch new file mode 100644 index 0000000000000000000000000000000000000000..5e93d6ead77ce808b37bca784adfb06f1f811724 --- /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 + Erik M. Bray + Gabriel de Perthuis +-Geoffrey Lehée + Hsiaoming Yang + Igor Kuzmitshov + Ilya Baryshev +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 diff --git a/python-pip.spec b/python-pip.spec index 3d035b59a33f24b5c58f6925acf4d9cb6a79f840..53cec2380320384a4c2bcbe450163e0e29673a8c 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 + * Wed Nov 4 2020 wangjie -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 - 18.0-6 -- Package init +- Package init \ No newline at end of file