rpms
/
python2
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

provide/obsolete _isa packages in python_provide (#1271776)

This commit is contained in:
Thomas Spura 2015-10-15 22:27:31 +02:00
parent 2881873aa2
commit 3b6fac0339
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
macros.python
View File

@ -13,33 +13,37 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski
function string.starts(String,Start)\ function string.starts(String,Start)\
return string.sub(String,1,string.len(Start))==Start\ return string.sub(String,1,string.len(Start))==Start\
end\ end\
str = rpm.expand("%{?1:%{1}}");\ package = rpm.expand("%{?1:%{1}}");\
vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}") vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}")
if (string.starts(str, "python2-")) then\ if (string.starts(package, "python2-")) then\
print("Provides: python-");\ str = "Provides: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} = " .. vr;\
print(string.sub(str,9,string.len(str)));\ print(rpm.expand(str));\
print("\\nProvides: python-");\
print(string.sub(package,9,string.len(package)));\
print(" = ");\ print(" = ");\
print(vr);\ print(vr);\
--Obsoleting the previous default python package\ --Obsoleting the previous default python package\
str = "\\nObsoletes: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} < " .. vr;\
print(rpm.expand(str));\
print("\\nObsoletes: python-");\ print("\\nObsoletes: python-");\
print(string.sub(str,9,string.len(str)));\ print(string.sub(package,9,string.len(package)));\
print(" < ");\ print(" < ");\
print(vr);\ print(vr);\
elseif (string.starts(str, "python3-")) then\ elseif (string.starts(package, "python3-")) then\
--No unversioned provides as python3 is not default\ --No unversioned provides as python3 is not default\
elseif (string.starts(str, "pypy-")) then\ elseif (string.starts(package, "pypy-")) then\
--No unversioned provides as pypy is not default\ --No unversioned provides as pypy is not default\
elseif (string.starts(str, "pypy3-")) then\ elseif (string.starts(package, "pypy3-")) then\
--No unversioned provides as pypy is not default\ --No unversioned provides as pypy is not default\
elseif (string.starts(str, "python-")) then\ elseif (string.starts(package, "python-")) then\
--Providing the current default python\ --Providing the current default python\
print("Provides: python2-");\ print("Provides: python2-");\
print(string.sub(str,8,string.len(str)));\ print(string.sub(package,8,string.len(package)));\
print(" = ");\ print(" = ");\
print(vr);\ print(vr);\
else\ else\
print("ERROR: ");\ print("ERROR: ");\
print(str);\ print(package);\
print("not recognized.");\ print("not recognized.");\
end\ end\
} }

5
python.spec
View File

@ -108,7 +108,7 @@ Summary: An interpreted, interactive, object-oriented programming language
Name: %{python} Name: %{python}
# Remember to also rebase python-docs when changing this: # Remember to also rebase python-docs when changing this:
Version: 2.7.10 Version: 2.7.10
Release: 10%{?dist} Release: 11%{?dist}
License: Python License: Python
Group: Development/Languages Group: Development/Languages
Requires: %{python}-libs%{?_isa} = %{version}-%{release} Requires: %{python}-libs%{?_isa} = %{version}-%{release}
@ -2155,6 +2155,9 @@ rm -fr %{buildroot}
# ====================================================== # ======================================================
%changelog %changelog
* Thu Oct 15 2015 Thomas Spura <tomspur@fedoraproject.org> - 2.7.10-11
- provide/obsolete _isa packages in python_provide (#1271776)
* Wed Sep 23 2015 Robert Kuska <rkuska@redhat.com> - 2.7.10-10 * Wed Sep 23 2015 Robert Kuska <rkuska@redhat.com> - 2.7.10-10
- Revert the moving modules to python-tools because distutils uses lib2to3 - Revert the moving modules to python-tools because distutils uses lib2to3