From ba203ce937dce8213a706213e02b9345bc452ed8c60b860f90f16d5ea48d1988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 10 Mar 2020 07:54:18 +0000 Subject: [PATCH] - Do not cause buildcycle with previous change but rather install the egg-info prepared metadata from the tarball OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-six?expand=0&rev=78 --- python-six.changes | 6 ++++++ python-six.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/python-six.changes b/python-six.changes index a179f9d..ba1d584 100644 --- a/python-six.changes +++ b/python-six.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 10 07:53:50 UTC 2020 - Tomáš Chvátal + +- Do not cause buildcycle with previous change but rather + install the egg-info prepared metadata from the tarball + ------------------------------------------------------------------- Mon Mar 9 20:54:38 UTC 2020 - Dirk Mueller diff --git a/python-six.spec b/python-six.spec index 3d3fdb6..71a4f70 100644 --- a/python-six.spec +++ b/python-six.spec @@ -35,7 +35,7 @@ License: MIT Group: Development/Libraries/Python URL: http://pypi.python.org/pypi/six/ Source: https://files.pythonhosted.org/packages/source/s/six/six-%{version}.tar.gz -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module base} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch @@ -80,6 +80,11 @@ cd documentation && make html && rm _build/html/.buildinfo %if ! %{with test} %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +# add the setuptools egg-info directory +%{python_expand rm %{buildroot}%{$python_sitelib}/six-%{version}-py%{$python_version}.egg-info +mkdir -p %{buildroot}%{$python_sitelib}/six-%{version}-py%{$python_version}.egg-info/ +cp six.egg-info/* %{buildroot}%{$python_sitelib}/six-%{version}-py%{$python_version}.egg-info/ +} %endif %check