From 3fd7c973238405e950e6b4d198164686c84ff4ecd81d0d143bf9c4e1979e6e2b Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Mon, 15 Jan 2018 04:15:54 +0000 Subject: [PATCH] Accepting request 564461 from home:lee_duncan:branches:Base:System - Removed duplicate BuildRequires line, and add Conflicts for sub-package OBS-URL: https://build.opensuse.org/request/show/564461 OBS-URL: https://build.opensuse.org/package/show/Base:System/targetcli-fb?expand=0&rev=12 --- targetcli-fb.changes | 6 ++++++ targetcli-fb.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/targetcli-fb.changes b/targetcli-fb.changes index 8540ece..4db48e5 100644 --- a/targetcli-fb.changes +++ b/targetcli-fb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 15 02:32:27 UTC 2018 - lduncan@suse.com + +- Removed duplicate BuildRequires line, and add Conflicts for + sub-package + ------------------------------------------------------------------- Thu Jan 4 22:14:36 UTC 2018 - lduncan@suse.com diff --git a/targetcli-fb.spec b/targetcli-fb.spec index e6b8a97..7de9d63 100644 --- a/targetcli-fb.spec +++ b/targetcli-fb.spec @@ -34,7 +34,6 @@ BuildRequires: %{python_module pyparsing} BuildRequires: %{python_module rtslib-fb} BuildRequires: %{python_module setuptools} BuildRequires: fdupes -BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: systemd Requires: python-configshell-fb @@ -68,6 +67,7 @@ no longer strictly compatible. Summary: Common targetcli-fb subpackage for either flavor of Python Group: System/Management Provides: %{python_module targetcli-fb-common} +Conflicts: targetcli %description -n %{name}-common targetcli-fb-common is the invariant base package needed by both