e78c420523
The %__python_magic filter suddenly got actually working with file 5.39:
Before:
file.cpython-38.opt-1.pyc: data
After:
file.cpython-38.opt-1.pyc: python 3.8 byte-compiled
Hence, the filter started to pick all Python files regardless of their location.
Later, in the actual generator, paths like this were considered:
/opt/usr/lib/python3.X/...
And generated requirements on python(abi).
We don't actually need to filter the files by file magic,
so we drop it to get the previously accidentally working behavior.
We could choose if the path and magic filters are applied as OR or AND.
However, we don't want either.
We actually want to mach any files in Python directories regardless of their magic.
We *could* filter by file type (and executable bit) for provides,
but that would require us to split the attr files into two.
28 lines
1.1 KiB
Plaintext
28 lines
1.1 KiB
Plaintext
%__python_provides() %{lua:
|
|
-- Match buildroot/payload paths of the form
|
|
-- /PATH/OF/BUILDROOT/usr/bin/pythonMAJOR.MINOR
|
|
-- generating a line of the form
|
|
-- python(abi) = MAJOR.MINOR
|
|
-- (Don't match against -config tools e.g. /usr/bin/python2.6-config)
|
|
local path = rpm.expand('%1')
|
|
if path:match('/usr/bin/python%d+%.%d+$') then
|
|
local provides = path:gsub('.*/usr/bin/python(%d+%.%d+)', 'python(abi) = %1')
|
|
print(provides)
|
|
end
|
|
}
|
|
|
|
%__python_requires() %{lua:
|
|
-- Match buildroot paths of the form
|
|
-- /PATH/OF/BUILDROOT/usr/lib/pythonMAJOR.MINOR/ and
|
|
-- /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/
|
|
-- generating a line of the form:
|
|
-- python(abi) = MAJOR.MINOR
|
|
local path = rpm.expand('%1')
|
|
if path:match('/usr/lib%d*/python%d+%.%d+/.*') then
|
|
local requires = path:gsub('.*/usr/lib%d*/python(%d+%.%d+)/.*', 'python(abi) = %1')
|
|
print(requires)
|
|
end
|
|
}
|
|
|
|
%__python_path ^((%{_prefix}/lib(64)?/python[[:digit:]]+\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]+\\.[[:digit:]]+))$
|