python-rpm-generators.spec

@@ -2,7 +2,7 @@
 
 Name: python-rpm-generators
 Version: 9
-Release: 5
+Release: 1
 Summary: Dependency generators for Python RPMs
 
 License: GPLv2+
@@ -44,20 +44,5 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} pythondeps.sh pythondistdeps.py
 %{_rpmconfigdir}/pythondistdeps.py
 
 %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
 - Package init

pythondeps.sh

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

pythondistdeps.py

@@ -116,7 +116,7 @@ for f in files:
             # Try to parse the Python version from the path the metadata
             # resides at (e.g. /usr/lib/pythonX.Y/site-packages/...)
             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:
                 dist.py_version = res.group('pyver')
             else: