From dae306a8bea8f8c1af741114cc126940c3d7d31e01e60e8635a02466f68905c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 7 Aug 2018 07:20:00 +0000 Subject: [PATCH] - Fix the multibuild code OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=31 --- python-setuptools_scm.changes | 5 +++++ python-setuptools_scm.spec | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index 7c58e73..03fca47 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 7 07:19:37 UTC 2018 - tchvatal@suse.com + +- Fix the multibuild code + ------------------------------------------------------------------- Wed Aug 1 07:27:53 UTC 2018 - tchvatal@suse.com diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index c3aaa8e..692f145 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -24,7 +24,11 @@ %else %bcond_with test %endif +%if %{with test} +Name: python-setuptools_scm-%{flavor} +%else Name: python-setuptools_scm +%endif Version: 3.0.6 Release: 0 Summary: Manage your versions by scm tags @@ -43,7 +47,6 @@ BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: git BuildRequires: mercurial -Requires: this-is-only-for-build-envs %endif %if 0%{?suse_version} || 0%{?fedora_version} >= 24 Recommends: git @@ -62,8 +65,10 @@ in scm metadata. It also handles file finders for the supperted scm's. %python_build %install +%if !%{with test} %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif %if %{with test} %check @@ -72,7 +77,9 @@ in scm metadata. It also handles file finders for the supperted scm's. %files %{python_files} %license LICENSE +%if !%{with test} %doc README.rst CHANGELOG.rst %{python_sitelib}/setuptools_scm* +%endif %changelog