Compare commits
10 Commits
b997df3864
...
7da7f8d3e9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7da7f8d3e9 | ||
|
|
6cdd8a8788 | ||
|
|
e753a7c061 | ||
|
|
7f3eea9451 | ||
|
|
282ac800a3 | ||
|
|
fba5d87052 | ||
|
|
40d76f3193 | ||
|
|
4817f8fc81 | ||
|
|
3e0b18efa1 | ||
|
|
44b24878c3 |
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: python-rpm-generators
|
Name: python-rpm-generators
|
||||||
Version: 9
|
Version: 9
|
||||||
Release: 1
|
Release: 5
|
||||||
Summary: Dependency generators for Python RPMs
|
Summary: Dependency generators for Python RPMs
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -44,5 +44,20 @@ 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
|
||||||
|
- Fix the python3 version cannot be found when pyproject.toml is used for building
|
||||||
|
|
||||||
|
* Thu Oct 27 2022 zhangruifang <zhangruifang1@h-partners.com> - 9-3
|
||||||
|
- Rebuild for next release
|
||||||
|
|
||||||
|
* Fri Jan 07 2022 shixuantong <shixuantong@huawei.com> - 9-2
|
||||||
|
- downgrade version to 9
|
||||||
|
|
||||||
|
* Thu Dec 09 2021 liudabo <liudabo1@huawei.com> - 12-1
|
||||||
|
- upgrade version to 12
|
||||||
|
|
||||||
* Tue Sep 17 2019 openEuler Buildteam <buildteam@openeuler.org> - 9-1
|
* Tue Sep 17 2019 openEuler Buildteam <buildteam@openeuler.org> - 9-1
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
@ -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
|
||||||
|
|||||||
@ -116,7 +116,7 @@ for f in files:
|
|||||||
# Try to parse the Python version from the path the metadata
|
# Try to parse the Python version from the path the metadata
|
||||||
# resides at (e.g. /usr/lib/pythonX.Y/site-packages/...)
|
# resides at (e.g. /usr/lib/pythonX.Y/site-packages/...)
|
||||||
import re
|
import re
|
||||||
res = re.search(r"/python(?P<pyver>\d+\.\d)/", path_item)
|
res = re.search(r"/python(?P<pyver>\d+\.\d+)/", path_item)
|
||||||
if res:
|
if res:
|
||||||
dist.py_version = res.group('pyver')
|
dist.py_version = res.group('pyver')
|
||||||
else:
|
else:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user