From 2618dc3eb18a85d9989e2d28bd9b8b0256590e8d Mon Sep 17 00:00:00 2001 From: "Brett T. Warden" Date: Wed, 12 Feb 2025 09:10:23 -0800 Subject: [PATCH] Fix version parsing for libopenmpt Given tarball libopenmpt-0.7.13+release.autotools.tar.gz, ban 'autotools' from the version number, and replace '+' with '.', so instead of 0.7.13+.autotools, generate simply 0.7.13. --- autospec/tarball.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autospec/tarball.py b/autospec/tarball.py index 443038a..5ecbbe3 100644 --- a/autospec/tarball.py +++ b/autospec/tarball.py @@ -153,7 +153,7 @@ def convert_version(ver_str, name): # them out with expensive regular expressions banned_subs = ["x86.64", "source", "src", "all", "bin", "release", "rh", "ga", ".ce", "lcms", "onig", "linux", "gc", "sdk", "orig", - "jurko", "%2f", "%2F", "%20", "x265"] + "jurko", "%2f", "%2F", "%20", "x265", "autotools"] # package names may be modified in the version string by adding "lib" for # example. Remove these from the name before trying to remove the name from @@ -169,7 +169,7 @@ def convert_version(ver_str, name): ver_str = ver_str.replace(name.replace(mod, ""), "") # replace illegal characters - ver_str = ver_str.strip().replace('-', '.').replace('_', '.') + ver_str = ver_str.strip().replace('-', '.').replace('_', '.').replace('+', '.') # remove banned substrings for sub in banned_subs: