From 7c41168947c09d6a87867cecfb0c21f6336c493165030d3a3581ecb31f4af41d Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Sun, 25 Feb 2018 20:08:25 +0000 Subject: [PATCH] Accepting request 579902 from home:olh - Fix upgrade path by provide/obsolete targetcli/targetcli-fb (bsc#1082693) OBS-URL: https://build.opensuse.org/request/show/579902 OBS-URL: https://build.opensuse.org/package/show/Base:System/targetcli-fb?expand=0&rev=16 --- targetcli-fb.changes | 5 +++++ targetcli-fb.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/targetcli-fb.changes b/targetcli-fb.changes index 2058253..20cac63 100644 --- a/targetcli-fb.changes +++ b/targetcli-fb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 25 08:09:45 UTC 2018 - olaf@aepfle.de + +- Fix upgrade path by provide/obsolete targetcli/targetcli-fb (bsc#1082693) + ------------------------------------------------------------------- Mon Feb 5 10:44:30 UTC 2018 - olaf@aepfle.de diff --git a/targetcli-fb.spec b/targetcli-fb.spec index 4af1795..1f88395 100644 --- a/targetcli-fb.spec +++ b/targetcli-fb.spec @@ -45,9 +45,10 @@ Requires(post): update-alternatives Requires(postun): update-alternatives %ifpython3 Provides: targetcli-fb = %{version}-%{release} +Provides: targetcli = %{version}-%{release} %endif -Obsoletes: targetcli-fb < %{version}-%{release} -Conflicts: targetcli +Obsoletes: targetcli-fb +Obsoletes: targetcli BuildArch: noarch %{?systemd_requires} @@ -67,7 +68,6 @@ 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