diff --git a/python-base.changes b/python-base.changes index 54715be..5f26aad 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 2 08:09:03 UTC 2021 - Marcus Meissner + +- on sle12, python2 modules will still be called python-xxxx until EOL, + for newer SLE versions they will be python2-xxxx + ------------------------------------------------------------------- Fri Oct 15 08:17:46 UTC 2021 - Dominique Leuenberger diff --git a/python-base.spec b/python-base.spec index edf3f2a..45deafd 100644 --- a/python-base.spec +++ b/python-base.spec @@ -367,6 +367,12 @@ find . -name '*.py' -type f | grep -vE "^./Parser/|^./Python/" \ install -m 644 %{SOURCE5} %{buildroot}%{_libdir}/python%{python_version}/site-packages/_local.pth install -d -m 755 %{buildroot}%{_rpmconfigdir}/macros.d/ install -m 644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/ +%if %{suse_version} < 1500 +# on SLE12 and SLE11 the python2 modules will still be called python-xxxx +# as this SPEC file is used on SLE12, keep it in here for the time being +sed -i -e 's/python2_package_prefix python2/python2_package_prefix python/;' %{buildroot}%{_rpmconfigdir}/macros.d/macros.python2 +%endif + # make sure /usr/lib/python/site-packages exists even on lib64 machines mkdir -p %{buildroot}%{_prefix}/lib/python%{python_version}/site-packages ######################################## diff --git a/python-doc.spec b/python-doc.spec index 529be0b..fee42e7 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: python-doc Version: 2.7.18 Release: 0 diff --git a/python.spec b/python.spec index 4870866..df2da47 100644 --- a/python.spec +++ b/python.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: python Version: 2.7.18 Release: 0