From a29875aa27917112ceb0f9b0462e3e0c33e9b564e3b720dcb3a2873188f1cc6d Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Fri, 24 Jun 2016 23:33:09 +0000 Subject: [PATCH] Accepting request 404552 from home:lee_duncan:branches:devel:languages:python - Updated spec file: added Conflicts for python-configshell (bsc#986475) OBS-URL: https://build.opensuse.org/request/show/404552 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-configshell-fb?expand=0&rev=5 --- python-configshell-fb.changes | 6 ++++++ python-configshell-fb.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/python-configshell-fb.changes b/python-configshell-fb.changes index ea50900..5181370 100644 --- a/python-configshell-fb.changes +++ b/python-configshell-fb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 24 23:17:34 UTC 2016 - lduncan@suse.com + +- Updated spec file: added Conflicts for python-configshell + (bsc#986475) + ------------------------------------------------------------------- Fri Jun 24 15:20:29 UTC 2016 - lduncan@suse.com diff --git a/python-configshell-fb.spec b/python-configshell-fb.spec index e7d426b..0a2e4ba 100644 --- a/python-configshell-fb.spec +++ b/python-configshell-fb.spec @@ -31,6 +31,7 @@ Requires: /usr/bin/python Requires: python-pyparsing Requires: python-six BuildArch: noarch +Conflicts: python-configshell BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-pyparsing