Auto sync2gitlab import of python-rpm-generators-5-8.el8.src.rpm

python-rpm-generators.spec

@@ -5,7 +5,7 @@
 Name:           python-rpm-generators
 Summary:        Dependency generators for Python RPMs
 Version:        5
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 # Originally all those files were part of RPM, so license is kept here
 License:        GPLv2+
@@ -53,6 +53,10 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} pythondeps.sh pythondistdeps.py
 %{_rpmconfigdir}/pythondistdeps.py
 
 %changelog
+* Mon Nov 14 2022 Charalampos Stratakis <cstratak@redhat.com> - 5-8
+- Fix the pythondeps.sh and pythondistdeps.py scripts for multiple digits python versions
+- Resolves: rhbz#2143990
+
 * Tue Jun 15 2021 Tomas Orsava <torsava@redhat.com> - 5-7
 - Do not parse nested dist/egg-info metadata
 - Resolves: rhbz#1916172

pythondeps.sh

@@ -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 -E "/usr/lib[^/]*/python[[:digit:]]+\.[[:digit:]]+/.*" \
+        | sed -Ee "s|.*/usr/lib[^/]*/python([[:digit:]]+\.[[:digit:]]+)/.*|python(abi) = \1|g" \
         | sort | uniq
     ;;
 esac

pythondistdeps.py

@@ -125,7 +125,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: