Add obsoletes to %python_provide macro to fix upgrade path
- Fix python2- provides for python- packages in %python_provide
This commit is contained in:
parent
988c58d852
commit
cb9dd73459
|
@ -20,6 +20,11 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski
|
|||
print(string.sub(str,9,string.len(str)));\
|
||||
print(" = ");\
|
||||
print(vr);\
|
||||
--Obsoleting the previous default python package\
|
||||
print("\nObsoletes: python-");\
|
||||
print(string.sub(str,9,string.len(str)));\
|
||||
print(" < ");\
|
||||
print(vr);\
|
||||
elseif (string.starts(str, "python3-")) then\
|
||||
--No unversioned provides as python3 is not default\
|
||||
elseif (string.starts(str, "pypy-")) then\
|
||||
|
@ -29,7 +34,7 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski
|
|||
elseif (string.starts(str, "python-")) then\
|
||||
--Providing the current default python\
|
||||
print("Provides: python2-");\
|
||||
print(string.sub(str,9,string.len(str)));\
|
||||
print(string.sub(str,8,string.len(str)));\
|
||||
print(" = ");\
|
||||
print(vr);\
|
||||
else\
|
||||
|
|
|
@ -108,7 +108,7 @@ Summary: An interpreted, interactive, object-oriented programming language
|
|||
Name: %{python}
|
||||
# Remember to also rebase python-docs when changing this:
|
||||
Version: 2.7.10
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: Python
|
||||
Group: Development/Languages
|
||||
Requires: %{python}-libs%{?_isa} = %{version}-%{release}
|
||||
|
@ -2155,6 +2155,10 @@ rm -fr %{buildroot}
|
|||
# ======================================================
|
||||
|
||||
%changelog
|
||||
* Thu Sep 3 2015 Orion Poplawski <orion@cora.nwra.com> - 2.7.10-7
|
||||
- Add obsoletes to %%python_provide macro to fix upgrade path
|
||||
- Fix python2- provides for python- packages in %%python_provide
|
||||
|
||||
* Thu Jul 23 2015 Thomas Spura <tomspur@fedoraproject.org> - 2.7.10-6
|
||||
- python-macros: remove R on python (#1246036)
|
||||
|
||||
|
|
Loading…
Reference in New Issue