From 7974e66751f6c99bec97529077a27e3ef2894adb19cfd5943f48ac71b57b9dc1 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Wed, 14 Feb 2018 08:42:26 +0000 Subject: [PATCH] Accepting request 576470 from home:NMoreyChaisemartin:branches:science:HPC - Mark libpsm_infinipath1 as obsoleting psm2-compat to make sure it is always picked by default but can be manually "downgraded" to psm2-compat knowing user (bsc#1080773). OBS-URL: https://build.opensuse.org/request/show/576470 OBS-URL: https://build.opensuse.org/package/show/science:HPC/infinipath-psm?expand=0&rev=18 --- infinipath-psm.changes | 7 +++++++ infinipath-psm.spec | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/infinipath-psm.changes b/infinipath-psm.changes index 9883257..406fed6 100644 --- a/infinipath-psm.changes +++ b/infinipath-psm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 14 08:29:56 UTC 2018 - nmoreychaisemartin@suse.com + +- Mark libpsm_infinipath1 as obsoleting psm2-compat to make sure + it is always picked by default but can be manually "downgraded" + to psm2-compat knowing user (bsc#1080773). + ------------------------------------------------------------------- Tue Sep 5 12:28:30 UTC 2017 - nmoreychaisemartin@suse.com diff --git a/infinipath-psm.spec b/infinipath-psm.spec index 94f0e51..8ba9f53 100644 --- a/infinipath-psm.spec +++ b/infinipath-psm.spec @@ -1,7 +1,7 @@ # # spec file for package infinipath-psm # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -66,6 +66,13 @@ Group: System/Libraries Obsoletes: infinipath-psm < %{version} Provides: infinipath-psm = %{version} Conflicts: libpsm2-compat +# PSM1 library does not actually obsolete psm2-compat, BUT +# both RPM provide the same library leaving a choice for +# zypper/OBS. psm2-compat is to be used in extremely rare +# occasions by a knowing user wanting to try out their PSM1 application +# against PSM2 HW. Marking PSM1 as obsoleting psm2-compat +# fixes the issue and match RHEL behaviour. See bsc#1080773 +Obsoletes: libpsm2-compat %description -n %{lnamepsm} The PSM Messaging API, or PSM API, is QLogic's low-level