From b53980da7fb1b9e04bc49dbc5ffcea6266d48c0fd5fedec3abe7773c4a6ac892 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Fri, 30 Jun 2017 08:06:43 +0000 Subject: [PATCH] Accepting request 507239 from home:NMoreyChaisemartin:branches:science:HPC - Restore conflict with libpsm2-compat OBS-URL: https://build.opensuse.org/request/show/507239 OBS-URL: https://build.opensuse.org/package/show/science:HPC/infinipath-psm?expand=0&rev=14 --- infinipath-psm.changes | 5 +++++ infinipath-psm.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/infinipath-psm.changes b/infinipath-psm.changes index d06508a..803502a 100644 --- a/infinipath-psm.changes +++ b/infinipath-psm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 30 07:24:55 UTC 2017 - nmoreychaisemartin@suse.com + +- Restore conflict with libpsm2-compat + ------------------------------------------------------------------- Tue May 9 11:47:47 UTC 2017 - nmoreychaisemartin@suse.com diff --git a/infinipath-psm.spec b/infinipath-psm.spec index ac54579..dfefe0c 100644 --- a/infinipath-psm.spec +++ b/infinipath-psm.spec @@ -65,6 +65,7 @@ Summary: Development files for QLogic PSM Group: System/Libraries Obsoletes: infinipath-psm < %{version} Provides: infinipath-psm = %{version} +Conflicts: libpsm2-compat %description -n %{lnamepsm} The PSM Messaging API, or PSM API, is QLogic's low-level