!13 【24.03 LTS】软件包选型,升级到2.12.0版本

From: @yue-yuankun 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2024-03-04 08:22:57 +00:00 committed by Gitee
commit 96c4b4bf85
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 119 additions and 6 deletions

Binary file not shown.

View File

@ -0,0 +1,109 @@
From 4add64d07eb56f42ce9c9c6255bcbc64dafa9b1c Mon Sep 17 00:00:00 2001
From: yueyuankun <yueyuankun@kylinos.cn>
Date: Mon, 4 Mar 2024 11:14:11 +0800
Subject: [PATCH] bash-completion-2.12.0 remove python2
---
completions/Makefile.am | 11 +++--------
completions/Makefile.in | 11 +++--------
completions/python | 2 +-
3 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/completions/Makefile.am b/completions/Makefile.am
index 8f11291..fae5fc3 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -788,19 +788,14 @@ CLEANFILES = \
_px \
pxz \
py.test \
- py.test-2 \
py.test-3 \
pydoc3 \
- pylint-2 \
pylint-3 \
pypy \
pypy3 \
pyston \
pyston3 \
- pytest-2 \
pytest-3 \
- python2 \
- python2.7 \
python3 \
python3.3 \
python3.4 \
@@ -1156,13 +1151,13 @@ 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 pyston pyston3 python2 python2.7 \
+ micropython pypy pypy3 pyston pyston3 \
python3 python3.3 python3.4 python3.5 python3.6 python3.7 \
python3.8 python3.9 python3.10 python3.11 python3.12
$(ss) pyvenv \
diff --git a/completions/Makefile.in b/completions/Makefile.in
index 7117553..c2e43f9 100644
--- a/completions/Makefile.in
+++ b/completions/Makefile.in
@@ -1015,19 +1015,14 @@ CLEANFILES = \
_px \
pxz \
py.test \
- py.test-2 \
py.test-3 \
pydoc3 \
- pylint-2 \
pylint-3 \
pypy \
pypy3 \
pyston \
pyston3 \
- pytest-2 \
pytest-3 \
- python2 \
- python2.7 \
python3 \
python3.3 \
python3.4 \
@@ -1600,13 +1595,13 @@ 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 pyston pyston3 python2 python2.7 \
+ micropython pypy pypy3 pyston pyston3 \
python3 python3.3 python3.4 python3.5 python3.6 python3.7 \
python3.8 python3.9 python3.10 python3.11 python3.12
$(ss) pyvenv \
diff --git a/completions/python b/completions/python
index 5bf4b70..91e0f7a 100644
--- a/completions/python
+++ b/completions/python
@@ -119,7 +119,7 @@ _comp_cmd_python()
fi
} &&
complete -F _comp_cmd_python \
- python python2 python2.7 python3 python3.{3..12} \
+ python python3 python3.{3..12} \
pypy pypy3 pyston pyston3 micropython
# ex: filetype=sh
--
2.33.0

Binary file not shown.

View File

@ -2,17 +2,15 @@
%define _python_bytecompile_errors_terminate_build 0
Name: bash-completion
Version: 2.11
Release: 3
Version: 2.12.0
Release: 1
Epoch: 1
Summary: Completion for bash command
License: GPLv2+
URL: https://github.com/scop/bash-completion
Source0: https://github.com/scop/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
Patch0: %{name}-1.99-noblacklist.patch
Patch1: bash-completion-remove-python2.patch
Patch2: bash-completion-remove-redundant-python2-links.patch
Patch0: bash-completion-2.12.0-remove-python2.patch
BuildArch: noarch
@ -63,9 +61,15 @@ make -C completions check
%files help
%defattr(-,root,root)
%doc CHANGES README.md doc/bash_completion.txt CONTRIBUTING.md
%doc CHANGELOG.md README.md doc/configuration.md CONTRIBUTING.md
%changelog
* Mon Mar 04 2024 yueyuankun<yueyuankun@kylinos.cn> - 1:2.12.0-1
- Type:update
- ID:NA
- SUG:NA
- DESC:Update to version 2.12.0
* Tue Aug 2 2022 liyuanyuan <liyuanyuan@xfusion.com> - 1:2.11-3
- remove redundant python2 links