From 5f4331aa2ad603084d7f8a1b6cc6aa4e5ca86cc3d5e33d77072e190ce97e01b5 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 7 May 2018 15:29:21 +0000 Subject: [PATCH] Accepting request 605145 from home:dimstar:Factory - Fix conflict for python-bugzillatools: we have to take extra care for the single-spec rewritter not to conflict with python2-bugzillatools in the end (which does not exist). OBS-URL: https://build.opensuse.org/request/show/605145 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bugzilla?expand=0&rev=42 --- python-bugzilla.changes | 7 +++++++ python-bugzilla.spec | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/python-bugzilla.changes b/python-bugzilla.changes index 1bc15f0..32bc442 100644 --- a/python-bugzilla.changes +++ b/python-bugzilla.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 7 15:13:13 UTC 2018 - dimstar@opensuse.org + +- Fix conflict for python-bugzillatools: we have to take extra care + for the single-spec rewritter not to conflict with + python2-bugzillatools in the end (which does not exist). + ------------------------------------------------------------------- Wed May 2 07:10:38 UTC 2018 - tbechtold@suse.com diff --git a/python-bugzilla.spec b/python-bugzilla.spec index 2e93b0c..b5eec36 100644 --- a/python-bugzilla.spec +++ b/python-bugzilla.spec @@ -17,25 +17,24 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python Name: python-bugzilla Version: 2.1.0 Release: 0 Summary: Python library for Bugzilla License: GPL-2.0-or-later Group: Development/Libraries/Python -Url: https://github.com/python-bugzilla/python-bugzilla +URL: https://github.com/python-bugzilla/python-bugzilla Source: https://files.pythonhosted.org/packages/source/p/python-bugzilla/python-bugzilla-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros Requires: python-requests -Suggests: osc Requires(post): update-alternatives Requires(postun): update-alternatives -Conflicts: python-bugzillatools +Suggests: osc +Conflicts: %{oldpython}-bugzillatools BuildArch: noarch - %python_subpackages %description