rpms/python-rpm-generators
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use dynamic %_prefix value when matching files for python(abi) provides

Browse source 
See https://lists.fedoraproject.org/archives/list/packaging@lists.fedoraproject.org/thread/UFKUM5UKCTNGIT3KJVYEI5VXPI23QMBN/

Flatpak builds redefine %_prefix and the dependencies should remain present.

Also get rid of one useless ^ and prep the pattern for two digit Python major versions.

Add a test that tests that we match our default %_prefix (was the case even before this commit).
This commit is contained in:
Miro Hrončok 2020-04-07 14:41:51 +02:00
commit 8eef42cbaa
4 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python.attr
View file

@ -24,5 +24,5 @@
end
}
%__python_path ^((/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(^%{_bindir}/python[[:digit:]]\\.[[:digit:]]+))$
%__python_path ^((%{_prefix}/lib(64)?/python[[:digit:]]+\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]+\\.[[:digit:]]+))$
%__python_magic [Pp]ython.*(executable|byte-compiled)