From cfe914fc6f9462c33b9439ea732c795c7fed130f83434fb0c54217cd35e40044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 18 Jan 2019 09:58:19 +0000 Subject: [PATCH 1/2] Accepting request 666774 from home:dimstar:Factory Scripted push of project home:dimstar:Factory OBS-URL: https://build.opensuse.org/request/show/666774 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=108 --- python-pbr.changes | 8 ++++++++ python-pbr.spec | 14 ++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/python-pbr.changes b/python-pbr.changes index a593ac2..330aa24 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 17 15:56:29 UTC 2019 - Dominique Leuenberger + +- BuildIgnore python[23]-pyparsing: python-packaging requires it + for some actions it could perform, but we don't make use of these + here. Ignoring this dependency allows us to break open a + BuildCycle. + ------------------------------------------------------------------- Tue Dec 11 17:00:20 UTC 2018 - Matěj Cepl diff --git a/python-pbr.spec b/python-pbr.spec index 76c1d98..a612bed 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -1,7 +1,7 @@ # # spec file for package python-pbr # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,11 +23,6 @@ %else %bcond_with test %endif -%if !%{with test} -Name: python-pbr -%else -Name: python-pbr-%{flavor} -%endif Version: 4.3.0 Release: 0 Summary: Python Build Reasonableness @@ -40,11 +35,18 @@ Patch1: new_wheel.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +#!BuildIgnore: python2-pyparsing +#!BuildIgnore: python3-pyparsing Requires: python-setuptools Requires(post): update-alternatives Requires(postun): update-alternatives Obsoletes: python-pbr-doc BuildArch: noarch +%if !%{with test} +Name: python-pbr +%else +Name: python-pbr-%{flavor} +%endif %if %{with test} BuildRequires: %{python_module Sphinx >= 1.6.2} BuildRequires: %{python_module devel} From 953313e924a67b816f50af8ab54602570998adaf9756e1327395753c558e2b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 18 Jan 2019 09:59:59 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=109 --- python-pbr.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/python-pbr.spec b/python-pbr.spec index a612bed..1c28386 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -19,10 +19,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" +%define psuffix -test %bcond_without test %else +%define psuffix %{nil} %bcond_with test %endif +Name: python-pbr%{psuffix} Version: 4.3.0 Release: 0 Summary: Python Build Reasonableness @@ -42,11 +45,6 @@ Requires(post): update-alternatives Requires(postun): update-alternatives Obsoletes: python-pbr-doc BuildArch: noarch -%if !%{with test} -Name: python-pbr -%else -Name: python-pbr-%{flavor} -%endif %if %{with test} BuildRequires: %{python_module Sphinx >= 1.6.2} BuildRequires: %{python_module devel}