rpms/python-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove the arched provide from %python_provide macro

Browse Source 
The way it fetched the information abut archfulness was not reliable
and will stop working entirely.

See https://bugzilla.redhat.com/show_bug.cgi?id=1705656
This commit is contained in:
Miro Hrončok 2019-06-17 09:34:06 +02:00
parent 536b2efe4e
commit 04769fa014
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macros.python
View File

@ -49,10 +49,6 @@
package = rpm.expand("%{?1}") package = rpm.expand("%{?1}")
vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}") vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}")
if (string.starts(package, "python2-")) then if (string.starts(package, "python2-")) then
if (rpm.expand("%{?buildarch}") ~= "noarch") then
str = "Provides: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} = " .. vr
print(rpm.expand(str))
end
print("\\nProvides: python-") print("\\nProvides: python-")
print(string.sub(package,9,string.len(package))) print(string.sub(package,9,string.len(package)))
print(" = ") print(" = ")

1
python-rpm-macros.spec
View File

@ -77,6 +77,7 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
- Define %%python_sitelib, %%python_sitearch, %%python_version, %%python_version_nodots, - Define %%python_sitelib, %%python_sitearch, %%python_version, %%python_version_nodots,
in rpm 4.15 those are no longer defined, the meaning of python is derived from %%__python. in rpm 4.15 those are no longer defined, the meaning of python is derived from %%__python.
- Usage of %%__python or the above-mentioned macros will error unless user defined. - Usage of %%__python or the above-mentioned macros will error unless user defined.
- The %%python_provide macro no longer gives the arched provide for arched packages (#1705656)
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3-42 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild