- Avoid duplicite wheel name in the generated package, and we actually

don't need a subpackage at all.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=207
This commit is contained in:
Matej Cepl 2020-11-16 14:03:11 +00:00 committed by Git OBS Bridge
parent 6e0b8f1866
commit 3195338bfe
2 changed files with 9 additions and 11 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Nov 16 14:02:34 UTC 2020 - Matej Cepl <mcepl@suse.com>
- Avoid duplicite wheel name in the generated package, and we actually
don't need a subpackage at all.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 12 16:09:08 UTC 2020 - Matej Cepl <mcepl@suse.com> Thu Nov 12 16:09:08 UTC 2020 - Matej Cepl <mcepl@suse.com>

View File

@ -30,7 +30,7 @@
%else %else
%define psuffix %{nil} %define psuffix %{nil}
%bcond_with test %bcond_with test
%bcond_without wheel %bcond_with wheel
%endif %endif
%endif %endif
%bcond_without python2 %bcond_without python2
@ -97,15 +97,6 @@ setuptools is a collection of enhancements to the Python distutils that
allow you to build and distribute Python packages, allow you to build and distribute Python packages,
especially ones that have dependencies on other packages. especially ones that have dependencies on other packages.
%if %{with wheel}
%package wheel
Summary: Wheels for %{name}
BuildArch: noarch
%description wheel
Generated wheels for %{name}.
%endif
%prep %prep
%setup -q -n setuptools-%{version} %setup -q -n setuptools-%{version}
tar -xzvf %{SOURCE3} tar -xzvf %{SOURCE3}
@ -174,8 +165,10 @@ export PYTHONPATH=$(pwd)
%postun %postun
%python_uninstall_alternative easy_install %python_uninstall_alternative easy_install
%endif
%files %{python_files} %files %{python_files}
%if !%{with test} && !%{with wheel}
%license LICENSE %license LICENSE
%doc CHANGES.rst README.rst %doc CHANGES.rst README.rst
%python_alternative %{_bindir}/easy_install %python_alternative %{_bindir}/easy_install
@ -188,7 +181,6 @@ export PYTHONPATH=$(pwd)
%endif %endif
%if %{with wheel} %if %{with wheel}
%files %{python_files wheel}
%dir %{python_sitelib}/../wheels %dir %{python_sitelib}/../wheels
%{python_sitelib}/../wheels/* %{python_sitelib}/../wheels/*
%endif %endif