File pythondeps-python310.diff of Package python-rpm

Overview Repositories Revisions Requests Users Attributes Meta

File pythondeps-python310.diff of Package python-rpm (Revision c53a9124c0376316a1b4c38046cf914c)

Currently displaying revision c53a9124c0376316a1b4c38046cf914c , Show latest

Minimal change to enable python 3.10 in SLE15.

---
 fileattrs/python.attr | 28 ++++++++++++++++++++++++++--
 scripts/pythondeps.sh | 32 --------------------------------
 3 files changed, 28 insertions(+), 36 deletions(-)
 delete mode 100755 scripts/pythondeps.sh

Index: fileattrs/python.attr
===================================================================
--- fileattrs/python.attr.orig
+++ fileattrs/python.attr
@@ -1,4 +1,5 @@
 %__python_provides	%{_rpmconfigdir}/pythondeps.sh --provides
 %__python_requires	%{_rpmconfigdir}/pythondeps.sh --requires
-%__python_path	^((/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]\\.[[:digit:]]))$
+
+%__python_path	^((/usr/lib(64)?/python[[:digit:]]+\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]+\\.[[:digit:]]+))$
 %__python_magic		[Pp]ython.*(executable|byte-compiled)
Index: scripts/pythondeps.sh
===================================================================
--- scripts/pythondeps.sh.orig
+++ scripts/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

Places

File pythondeps-python310.diff of Package python-rpm (Revision c53a9124c0376316a1b4c38046cf914c)

Places