Remove redundant python2 link files
(cherry picked from commit 3936e3c27e9b3d8ae98493c17cd1e3f19fe9efe1)
This commit is contained in:
parent
510e46c11e
commit
b8e1c734ee
79
bash-completion-remove-redundant-python2-links.patch
Normal file
79
bash-completion-remove-redundant-python2-links.patch
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
From e67d1ffcb510e314f3bd37446ab8e79078ea9a0b Mon Sep 17 00:00:00 2001
|
||||||
|
From: liyuan <liyuanyuan@xfusion.com>
|
||||||
|
Date: Tue, 2 Aug 2022 15:15:09 +0800
|
||||||
|
Subject: [PATCH] bash completion remove redundant python2 links
|
||||||
|
|
||||||
|
---
|
||||||
|
completions/Makefile.am | 7 ++-----
|
||||||
|
completions/Makefile.in | 7 ++-----
|
||||||
|
2 files changed, 4 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/completions/Makefile.am b/completions/Makefile.am
|
||||||
|
index 2d0c0f2..91a6a90 100644
|
||||||
|
--- a/completions/Makefile.am
|
||||||
|
+++ b/completions/Makefile.am
|
||||||
|
@@ -657,14 +657,11 @@ CLEANFILES = \
|
||||||
|
pvscan \
|
||||||
|
pxz \
|
||||||
|
py.test \
|
||||||
|
- py.test-2 \
|
||||||
|
py.test-3 \
|
||||||
|
pydoc3 \
|
||||||
|
- pylint-2 \
|
||||||
|
pylint-3 \
|
||||||
|
pypy \
|
||||||
|
pypy3 \
|
||||||
|
- pytest-2 \
|
||||||
|
pytest-3 \
|
||||||
|
python3 \
|
||||||
|
python3.3 \
|
||||||
|
@@ -882,11 +879,11 @@ symlinks: $(DATA)
|
||||||
|
filebucket puppetca puppetd puppetdoc puppetmasterd puppetqd \
|
||||||
|
puppetrun ralsh
|
||||||
|
$(ss) pytest \
|
||||||
|
- py.test py.test-2 py.test-3 pytest-2 pytest-3
|
||||||
|
+ py.test py.test-3 pytest-3
|
||||||
|
$(ss) pydoc \
|
||||||
|
pydoc3
|
||||||
|
$(ss) pylint \
|
||||||
|
- pylint-2 pylint-3
|
||||||
|
+ pylint-3
|
||||||
|
$(ss) python \
|
||||||
|
micropython pypy pypy3 python3 python3.3 python3.4 python3.5 python3.6 python3.7 python3.8
|
||||||
|
$(ss) pyvenv \
|
||||||
|
diff --git a/completions/Makefile.in b/completions/Makefile.in
|
||||||
|
index fe2ad1c..897faba 100644
|
||||||
|
--- a/completions/Makefile.in
|
||||||
|
+++ b/completions/Makefile.in
|
||||||
|
@@ -881,14 +881,11 @@ CLEANFILES = \
|
||||||
|
pvscan \
|
||||||
|
pxz \
|
||||||
|
py.test \
|
||||||
|
- py.test-2 \
|
||||||
|
py.test-3 \
|
||||||
|
pydoc3 \
|
||||||
|
- pylint-2 \
|
||||||
|
pylint-3 \
|
||||||
|
pypy \
|
||||||
|
pypy3 \
|
||||||
|
- pytest-2 \
|
||||||
|
pytest-3 \
|
||||||
|
python3 \
|
||||||
|
python3.3 \
|
||||||
|
@@ -1324,11 +1321,11 @@ symlinks: $(DATA)
|
||||||
|
filebucket puppetca puppetd puppetdoc puppetmasterd puppetqd \
|
||||||
|
puppetrun ralsh
|
||||||
|
$(ss) pytest \
|
||||||
|
- py.test py.test-2 py.test-3 pytest-2 pytest-3
|
||||||
|
+ py.test py.test-3 pytest-3
|
||||||
|
$(ss) pydoc \
|
||||||
|
pydoc3
|
||||||
|
$(ss) pylint \
|
||||||
|
- pylint-2 pylint-3
|
||||||
|
+ pylint-3
|
||||||
|
$(ss) python \
|
||||||
|
micropython pypy pypy3 python3 python3.3 python3.4 python3.5 python3.6 python3.7 python3.8
|
||||||
|
$(ss) pyvenv \
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: bash-completion
|
Name: bash-completion
|
||||||
Version: 2.11
|
Version: 2.11
|
||||||
Release: 2
|
Release: 3
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Summary: Completion for bash command
|
Summary: Completion for bash command
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -12,6 +12,7 @@ Source0: https://github.com/scop/%{name}/releases/download/%{version}/%{na
|
|||||||
|
|
||||||
Patch0: %{name}-1.99-noblacklist.patch
|
Patch0: %{name}-1.99-noblacklist.patch
|
||||||
Patch1: bash-completion-remove-python2.patch
|
Patch1: bash-completion-remove-python2.patch
|
||||||
|
Patch2: bash-completion-remove-redundant-python2-links.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -65,6 +66,9 @@ make -C completions check
|
|||||||
%doc CHANGES README.md doc/bash_completion.txt CONTRIBUTING.md
|
%doc CHANGES README.md doc/bash_completion.txt CONTRIBUTING.md
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 2 2022 liyuanyuan <liyuanyuan@xfusion.com> - 1:2.11-3
|
||||||
|
- remove redundant python2 links
|
||||||
|
|
||||||
* Mon Jun 20 2022 renhongxun <renhongxun@h-partners.com> - 1:2.11-2
|
* Mon Jun 20 2022 renhongxun <renhongxun@h-partners.com> - 1:2.11-2
|
||||||
- remove python2
|
- remove python2
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user