Accepting request 900809 from home:bnavigator:branches:devel:languages:python

- Add python dist provides for setuptools, pkg_resources and
  easy_install: work around boo#1186870
- Dont create a package for -test flavor

OBS-URL: https://build.opensuse.org/request/show/900809
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=215
This commit is contained in:
Matej Cepl 2021-06-18 19:35:18 +00:00 committed by Git OBS Bridge
parent 7cabbfc77d
commit 1ede3fffef
2 changed files with 25 additions and 3 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jun 17 17:03:46 UTC 2021 - Ben Greiner <code@bnavigator.de>
- Add python dist provides for setuptools, pkg_resources and
easy_install: work around boo#1186870
- Dont create a package for -test flavor
-------------------------------------------------------------------
Fri Jan 22 19:05:02 UTC 2021 - Matej Cepl <mcepl@suse.com>

View File

@ -1,5 +1,5 @@
#
# spec file for package python-setuptools
# spec file
#
# Copyright (c) 2021 SUSE LLC
#
@ -34,6 +34,8 @@
%endif
%endif
%bcond_without python2
# in order to avoid rewriting for subpackage generator
%define mypython python
Name: python-setuptools%{psuffix}
Version: 44.1.1
Release: 0
@ -63,7 +65,7 @@ Requires: python-packaging
Requires: python-six
Requires: python-xml
Requires(post): update-alternatives
Requires(postun): update-alternatives
Requires(postun):update-alternatives
BuildArch: noarch
# The dependency download feature may require SSL, which is in python3-base and python(2)
%ifpython2
@ -92,6 +94,17 @@ Obsoletes: %{oldpython}-distribute < %{version}
%if %{with wheel}
BuildRequires: %{python_module wheel}
%endif
%if !%{with test} && !%{with wheel}
# work around boo#1186870
Provides: %{mypython}%{python_version}dist(setuptools) = %{version}
Provides: %{mypython}%{python_version}dist(easy_install) = %{version}
Provides: %{mypython}%{python_version}dist(pkg_resources) = %{version}
%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
Provides: %{mypython}3dist(easy_install) = %{version}
Provides: %{mypython}3dist(pkg_resources) = %{version}
Provides: %{mypython}3dist(setuptools) = %{version}
%endif
%endif
%python_subpackages
%description
@ -172,8 +185,9 @@ export PYTHONPATH=$(pwd)
%python_uninstall_alternative easy_install
%endif
%if !%{with test}
%files %{python_files}
%if !%{with test} && !%{with wheel}
%if !%{with wheel}
%license LICENSE
%doc CHANGES.rst README.rst
%python_alternative %{_bindir}/easy_install
@ -189,5 +203,6 @@ export PYTHONPATH=$(pwd)
%dir %{python_sitelib}/../wheels
%{python_sitelib}/../wheels/*
%endif
%endif
%changelog