packages/python-rpm-generators
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!12 fix python provide and requires

Browse Source 
From: @chen-huihan 
Reviewed-by: @xinsheng3, @zhuchunyi 
Signed-off-by: @zhuchunyi
This commit is contained in:
openeuler-ci-bot 2024-08-13 01:28:38 +00:00 committed by Gitee
commit 7da7f8d3e9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-rpm-generators.spec
View File

@ -2,7 +2,7 @@
Name: python-rpm-generators Name: python-rpm-generators
Version: 9 Version: 9
Release: 4 Release: 5
Summary: Dependency generators for Python RPMs Summary: Dependency generators for Python RPMs
License: GPLv2+ License: GPLv2+
@ -44,6 +44,9 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} pythondeps.sh pythondistdeps.py
%{_rpmconfigdir}/pythondistdeps.py %{_rpmconfigdir}/pythondistdeps.py
%changelog %changelog
* Tue Aug 06 2024 chenhuihan <chenhuihan@huawei.com> - 9-5
- Fix python provide and requires
* Sun Apr 23 2023 caodongxia <caodongxia@h-partners.com> - 9-4 * Sun Apr 23 2023 caodongxia <caodongxia@h-partners.com> - 9-4
- Fix the python3 version cannot be found when pyproject.toml is used for building - Fix the python3 version cannot be found when pyproject.toml is used for building

8
pythondeps.sh
View File

@ -13,8 +13,8 @@ case $1 in
# generating a line of the form # generating a line of the form
# python(abi) = MAJOR.MINOR # python(abi) = MAJOR.MINOR
# (Don't match against -config tools e.g. /usr/bin/python2.6-config) # (Don't match against -config tools e.g. /usr/bin/python2.6-config)
grep "/usr/bin/python.\..$" \ grep "/usr/bin/python.\...$" \
| sed -e "s|.*/usr/bin/python\(.\..\)|python(abi) = \1|" | sed -e "s|.*/usr/bin/python\(.\...\)|python(abi) = \1|"
;; ;;
-R|--requires) -R|--requires)
shift shift
@ -23,8 +23,8 @@ case $1 in
# /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/ # /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/
# generating (uniqely) lines of the form: # generating (uniqely) lines of the form:
# python(abi) = MAJOR.MINOR # python(abi) = MAJOR.MINOR
grep "/usr/lib[^/]*/python.\../.*" \ grep "/usr/lib[^/]*/python.\.../.*" \
| sed -e "s|.*/usr/lib[^/]*/python\(.\..\)/.*|python(abi) = \1|g" \ | sed -e "s|.*/usr/lib[^/]*/python\(.\...\)/.*|python(abi) = \1|g" \
| sort | uniq | sort | uniq
;; ;;
esac esac