From 1b1c2908e5bee5f13ab2fab61871437f0a8aa4bf4555db469520554b03d93ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 18 Jul 2018 11:52:52 +0000 Subject: [PATCH] - Whitespace in prep phase to ensure we build on Leap 42 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bugzillatools?expand=0&rev=11 --- python-bugzillatools.changes | 5 +++++ python-bugzillatools.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/python-bugzillatools.changes b/python-bugzillatools.changes index 5a0c739..7ba961e 100644 --- a/python-bugzillatools.changes +++ b/python-bugzillatools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 18 11:52:31 UTC 2018 - tchvatal@suse.com + +- Whitespace in prep phase to ensure we build on Leap 42 + ------------------------------------------------------------------- Thu May 31 10:40:54 UTC 2018 - mcepl@suse.com diff --git a/python-bugzillatools.spec b/python-bugzillatools.spec index f972385..af918c5 100644 --- a/python-bugzillatools.spec +++ b/python-bugzillatools.spec @@ -17,7 +17,6 @@ %define oldpython python - %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-bugzillatools Version: 0.5.5 @@ -35,12 +34,12 @@ Patch1: no-bzrlib-py3k.patch BuildRequires: %{python_module devel} BuildRequires: fdupes BuildRequires: python-rpm-macros -#Recommends: bzr -# File conflict for /usr/bin/bugzilla: -Conflicts: python-bugzilla # We want to conflict even package literally called python-bugzilla # without the python version number Conflicts: %{oldpython}-bugzilla +#Recommends: bzr +# File conflict for /usr/bin/bugzilla: +Conflicts: python-bugzilla BuildArch: noarch %python_subpackages @@ -51,6 +50,7 @@ systems that enable interaction with Bugzilla installations. %prep %autosetup -p1 -n bugzillatools-%{version} + sed -i "/.bugzillarc.sample/d" setup.py %build