diff --git a/libpsm2.changes b/libpsm2.changes index 57de374..023ea89 100644 --- a/libpsm2.changes +++ b/libpsm2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 12 15:07:22 UTC 2018 - nmoreychaisemartin@suse.com + +- Prevent libpsm2-compat to provide libpsm_infinipath.so (bsc#1080773) + ------------------------------------------------------------------- Fri Dec 8 08:25:14 UTC 2017 - nmoreychaisemartin@suse.com diff --git a/libpsm2.spec b/libpsm2.spec index 81accf5..23f6f92 100644 --- a/libpsm2.spec +++ b/libpsm2.spec @@ -1,7 +1,7 @@ # # spec file for package libpsm2 # -# 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 @@ -80,6 +80,11 @@ Development files for the libpsm2 library. %description compat Support for MPIs linked with PSM versions < 2. +# Prevent libpsm2-compat from providing libpsm_infinipath to avoid zypper +# pulling it when libpsm1 is required. +# libpsm2-compat user should have both PSM1 and PSM2 compat installed +# and use PSM2-compat by setting the proper LD_LIBRARY_PATH +%define __provides_exclude_from ^%{_libdir}/libpsm_infinipath.so.*$ %prep %setup -q -n %{name}-%{version}%{git_ver}