Hello community, here is the log from the commit of package python-setuptools for openSUSE:Factory checked in at 2020-11-17 21:21:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-setuptools (Old) and /work/SRC/openSUSE:Factory/.python-setuptools.new.24930 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-setuptools" Tue Nov 17 21:21:26 2020 rev:62 rq:848902 version:44.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-setuptools/python-setuptools.changes 2020-08-25 12:36:12.469360227 +0200 +++ /work/SRC/openSUSE:Factory/.python-setuptools.new.24930/python-setuptools.changes 2020-11-17 21:21:38.433118078 +0100 @@ -1,0 +2,18 @@ +Mon Nov 16 14:02:34 UTC 2020 - Matej Cepl <mc...@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 <mc...@suse.com> + +- Make wheel a separate build run to avoid the setuptools/wheel build + cycle. + +------------------------------------------------------------------- +Tue Nov 10 09:21:02 UTC 2020 - Matej Cepl <mc...@suse.com> + +- Add wheel subpackage with the generated wheel for this package + (bsc#1176262, CVE-2019-20916). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-setuptools.spec ++++++ --- /var/tmp/diff_new_pack.NCKxAC/_old 2020-11-17 21:21:40.993121944 +0100 +++ /var/tmp/diff_new_pack.NCKxAC/_new 2020-11-17 21:21:40.997121950 +0100 @@ -22,9 +22,16 @@ %if "%{flavor}" == "test" %define psuffix -test %bcond_without test +%bcond_with wheel +%else +%if "%{flavor}" == "wheel" +%define psuffix -wheel +%bcond_without wheel %else %define psuffix %{nil} %bcond_with test +%bcond_with wheel +%endif %endif %bcond_without python2 Name: python-setuptools%{psuffix} @@ -80,6 +87,9 @@ Provides: %{oldpython}-distribute = %{version} Obsoletes: %{oldpython}-distribute < %{version} %endif +%if %{with wheel} +BuildRequires: %{python_module wheel} +%endif %python_subpackages %description @@ -121,15 +131,24 @@ {} \; %build +%if ! %{with wheel} %python_build +%else +%python_exec setup.py bdist_wheel --universal +%endif %install -%if !%{with test} +%if !%{with test} && !%{with wheel} %python_install %prepare_alternative easy_install + %python_expand %fdupes %{buildroot}%{$python_sitelib} %endif +%if %{with wheel} +%python_expand install -D -m 0644 -t %{buildroot}%{$python_sitelib}/../wheels dist/*.whl +%endif + %check %if %{with test} # the 4 skipped test rely on the bundled packages but they are @@ -140,14 +159,16 @@ %pytest -k 'not (test_clean_env_install or test_pip_upgrade_from_source or test_test_command_install_requirements or test_no_missing_dependencies)' %endif -%if !%{with test} +%if !%{with test} && !%{with wheel} %post %python_install_alternative easy_install %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 @@ -159,4 +180,9 @@ %{python_sitelib}/pkg_resources/* %endif +%if %{with wheel} +%dir %{python_sitelib}/../wheels +%{python_sitelib}/../wheels/* +%endif + %changelog ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.NCKxAC/_old 2020-11-17 21:21:41.065122052 +0100 +++ /var/tmp/diff_new_pack.NCKxAC/_new 2020-11-17 21:21:41.065122052 +0100 @@ -1,3 +1,4 @@ <multibuild> <package>test</package> + <package>wheel</package> </multibuild> _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org