- up to 54.2.0; builds without apidocs; easy_install gone upstream

diff --git a/python3-setuptools.spec b/python3-setuptools.spec
index a3bd1a78d3b73997071b3225505655bcf4bb96c5..d584c862a3320c02f34576fa6bad9b231c408419 100644 (file)
--- a/python3-setuptools.spec
+++ b/python3-setuptools.spec
@@ -16,14 +16,14 @@
 Summary:       A collection of enhancements to the Python distutils
 Summary(pl.UTF-8):     Zestaw rozszerzeń dla pythonowych distutils
 Name:          python3-setuptools
-Version:       42.0.2
-Release:       5
+Version:       54.2.0
+Release:       1
 Epoch:         1
 License:       MIT
 Group:         Development/Languages/Python
 #Source0Download: https://pypi.org/simple/setuptools/
-Source0:       https://files.pythonhosted.org/packages/source/s/setuptools/%{pypi_name}-%{version}.zip
-# Source0-md5: 5ac69b66a6f7d4785517017f37df28e9
+Source0:       https://files.pythonhosted.org/packages/source/s/setuptools/%{pypi_name}-%{version}.tar.gz
+# Source0-md5: 09f693b5d5ca8bf4fdb1da82f8110a9c
 URL:           https://github.com/pypa/setuptools
 %if %(locale -a | grep -q '^C\.utf8$'; echo $?)
 BuildRequires: glibc-localedb-all
@@ -58,21 +58,20 @@ BuildRequires:      python3-jaraco
 BuildRequires: python3-jaraco.packaging >= 6.1
 BuildRequires: python3-rst.linker >= 1.9
 BuildRequires: python3-setuptools >= 34
+BuildRequires: python3-tox
 BuildRequires: sphinx-pdg-3 >= 1.4
 %endif
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.714
 BuildRequires: unzip
-Requires:      python-modules >= 1:2.7
+Requires:      python3-modules
 %if %{with system_libs}
 # versions from pkg_resources/_vendor/vendored.txt
-Requires:      python-appdirs >= 1.4.0
-Requires:      python-packaging >= 16.8
-Requires:      python-pyparsing >= 2.1.10
-Requires:      python-six >= 1.10.0
+Requires:      python3-appdirs >= 1.4.0
+Requires:      python3-packaging >= 16.8
+Requires:      python3-pyparsing >= 2.1.10
+Requires:      python3-six >= 1.10.0
 %endif
-Obsoletes:     python-distribute < 0.7
-Obsoletes:     python-setuptools-devel
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -90,24 +89,6 @@ Ten pakiet zawiera składniki uruchomieniowe setuptools, potrzebne do
 uruchamiania kodu wymagającego pkg_resources.py, przeznaczone dla
 Pythona 2.x.
 
-%package -n easy_install
-Summary:       Python software installer (deprecated)
-Summary(pl.UTF-8):     Instalator oprogramowania napisanego w Pythonie (przestarzały)
-Group:         Libraries/Python
-%if %{with python3_default}
-Requires:      python3-%{module} = %{epoch}:%{version}-%{release}
-%else
-Requires:      python-%{module} = %{epoch}:%{version}-%{release}
-%endif
-Conflicts:     python-setuptools < 1:18.6.1-2
-
-%description -n easy_install
-Python software installer. It's deprecated in favour of pip.
-
-%description -n easy_install -l pl.UTF-8
-Instalator oprogramowania napisanego w Pythonie. Jest przestarzały,
-aktualnym zamiennikiem jest pip.
-
 %package apidocs
 Summary:       %{module} API documentation
 Summary(pl.UTF-8):     Dokumentacja API %{module}
@@ -133,7 +114,7 @@ LC_ALL=C.UTF-8 \
 %{?with_tests:%{__python3} -m pytest pkg_resources/tests setuptools/tests tests}
 
 %if %{with apidocs}
-%{__make} -C docs html SPHINXBUILD=sphinx-build-3
+%{_bindir}/tox -e docs
 %endif
 
 %install
@@ -141,25 +122,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %py3_install
 
-ln -sf easy_install-%{py3_ver} $RPM_BUILD_ROOT%{_bindir}/easy_install
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc CHANGES.rst LICENSE README.rst
-%attr(755,root,root) %{_bindir}/easy_install-%{py3_ver}
-%{py3_sitescriptdir}/__pycache__/easy_install.*.py[co]
+%{py3_sitescriptdir}//distutils-precedence.pth
+%{py3_sitescriptdir}/_distutils_hack
 %{py3_sitescriptdir}/pkg_resources
 %{py3_sitescriptdir}/setuptools
-%{py3_sitescriptdir}/easy_install.py
 %{py3_sitescriptdir}/%{module}-%{version}-py*.egg-info
 
-%files -n easy_install
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/easy_install
-
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)