rpms
/
python-rpm-macros
2
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into epel7

This commit is contained in:
Orion Poplawski 2016-01-14 20:51:58 -07:00
parent 68a7e6e10b 2b90e4a07b
commit 0795b1d7b1
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
macros.python
View File

@ -33,9 +33,9 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski
print(string.sub(package,9,string.len(package)));\
print(" < ");\
print(vr);\
elseif (string.starts(str, "python" .. rpm.expand("%{python3_pkgversion}") .. "-")) then\
elseif (string.starts(package, "python" .. rpm.expand("%{python3_pkgversion}") .. "-")) then\
--No unversioned provides as python3 is not default\
elseif (rpm.expand("%{?python3_other_pkgversion}") ~= "" and string.starts(str, "python" .. rpm.expand("%{python3_other_pkgversion}") .. "-")) then\
elseif (rpm.expand("%{?python3_other_pkgversion}") ~= "" and string.starts(package, "python" .. rpm.expand("%{python3_other_pkgversion}") .. "-")) then\
--No unversioned provides as python3_other is not default\
elseif (string.starts(package, "pypy-")) then\
--No unversioned provides as pypy is not default\
@ -48,8 +48,8 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski
print(" = ");\
print(vr);\
else\
print("ERROR: ");\
print("%python_provide: ERROR: ");\
print(package);\
print("not recognized.");\
print(" not recognized.");\
end\
}

5
python-rpm-macros.spec
View File

@ -1,6 +1,6 @@
Name: python-rpm-macros
Version: 3
Release: 5%{?dist}
Release: 6%{?dist}
Summary: The unversioned Python RPM macros
License: MIT
@ -61,6 +61,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \
%changelog
* Thu Jan 14 2016 Orion Poplawski <orion@cora.nwra.com> 3-6
- Fix typo in %%python_provide
* Thu Jan 14 2016 Orion Poplawski <orion@cora.nwra.com> 3-5
- Handle noarch python sub-packages (bug #1290900)