diff --git a/python-setuptools.changes b/python-setuptools.changes index 1baff30..18fb506 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 16 14:02:34 UTC 2020 - Matej Cepl + +- 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 diff --git a/python-setuptools.spec b/python-setuptools.spec index 8f687c4..95f4812 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -30,7 +30,7 @@ %else %define psuffix %{nil} %bcond_with test -%bcond_without wheel +%bcond_with wheel %endif %endif %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, 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 %setup -q -n setuptools-%{version} tar -xzvf %{SOURCE3} @@ -174,8 +165,10 @@ export PYTHONPATH=$(pwd) %postun %python_uninstall_alternative easy_install +%endif %files %{python_files} +%if !%{with test} && !%{with wheel} %license LICENSE %doc CHANGES.rst README.rst %python_alternative %{_bindir}/easy_install @@ -188,7 +181,6 @@ export PYTHONPATH=$(pwd) %endif %if %{with wheel} -%files %{python_files wheel} %dir %{python_sitelib}/../wheels %{python_sitelib}/../wheels/* %endif