From 671f84539165207380687dd35c366fc50eb62de0422fa825118a08104798cba2 Mon Sep 17 00:00:00 2001
From: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
Date: Fri, 30 Jun 2017 08:06:38 +0000
Subject: [PATCH] Accepting request 507240 from
 home:NMoreyChaisemartin:branches:science:HPC

- Install psm2-compat library in the standard path
- Have libpsm2-compat conflict with libpsm_infinipath1

OBS-URL: https://build.opensuse.org/request/show/507240
OBS-URL: https://build.opensuse.org/package/show/science:HPC/libpsm2?expand=0&rev=23
---
 libpsm2-rpmlintrc |  4 ++++
 libpsm2.changes   |  6 ++++++
 libpsm2.spec      | 10 +++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 libpsm2-rpmlintrc

diff --git a/libpsm2-rpmlintrc b/libpsm2-rpmlintrc
new file mode 100644
index 0000000..ca8ffd8
--- /dev/null
+++ b/libpsm2-rpmlintrc
@@ -0,0 +1,4 @@
+# This line is mandatory to access the configuration functions
+from Config import *
+
+addFilter("libpsm2-compat.* shlib-policy-name-error")
diff --git a/libpsm2.changes b/libpsm2.changes
index 29cc296..a06acab 100644
--- a/libpsm2.changes
+++ b/libpsm2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 30 07:20:15 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Install psm2-compat library in the standard path
+- Have libpsm2-compat conflict with libpsm_infinipath1
+
 -------------------------------------------------------------------
 Fri May 19 19:07:37 UTC 2017 - dimstar@opensuse.org
 
diff --git a/libpsm2.spec b/libpsm2.spec
index ca4330b..16d3c2d 100644
--- a/libpsm2.spec
+++ b/libpsm2.spec
@@ -26,6 +26,7 @@ Group:          Development/Libraries/C and C++
 Url:            https://github.com/01org/opa-psm2/
 Source:         %{name}-%{version}.tar.bz2
 Source1:        libpsm2.changelog
+Source2:        libpsm2-rpmlintrc
 Patch2:         libpsm2-use_RPM_OPT_FLAGS.patch
 Patch3:         libpsm2-use-exported-variable-for-version-and-release.patch
 Patch4:         libpsm2-include-ioctl_h.patch
@@ -69,7 +70,7 @@ Conflicts:      opa-devel
 Summary:        Compatibility library providing the old PSM API/ABI
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-%{psm_so} = %{version}
-#Obsoletes:      hfi-psm-compat
+Conflicts:      libpsm_infinipath1
 
 %description    devel
 Development files for the libpsm2 library.
@@ -77,6 +78,7 @@ Development files for the libpsm2 library.
 %description    compat
 Support for MPIs linked with PSM versions < 2.
 
+
 %prep
 %setup -q -n %{name}-%{version}
 %patch2
@@ -95,7 +97,7 @@ make %{?_smp_mflags}
 export DESTDIR=%{buildroot}
 make %{?_smp_mflags} DESTDIR=%{buildroot} install
 mkdir -p -m 0755 -p %{buildroot}/%{_libdir}/psm2
-install -m0644 %{buildroot}/%{_libdir}/psm2-compat/libpsm_infinipath.so.1 %{buildroot}/%{_libdir}/psm2/libpsm_infinipath.so.1
+install -m0644 %{buildroot}/%{_libdir}/psm2-compat/libpsm_infinipath.so.1 %{buildroot}/%{_libdir}/libpsm_infinipath.so.1
 # removing file to get rid of rpm errors
 rm  %{buildroot}/%{_libdir}/psm2-compat/libpsm_infinipath.so.1
 rm  %{buildroot}/%{_libexecdir}/%name/libpsm2-compat.cmds
@@ -104,6 +106,8 @@ rm  %{buildroot}/%{_libexecdir}/%name/libpsm2-compat.cmds
 %postun -n %{name}-%{psm_so} -p /sbin/ldconfig
 %post devel -p /sbin/ldconfig
 %postun devel -p /sbin/ldconfig
+%post compat -p /sbin/ldconfig
+%postun compat -p /sbin/ldconfig
 
 %files -n %{name}-%{psm_so}
 %defattr(-,root,root,-)
@@ -143,7 +147,7 @@ rm  %{buildroot}/%{_libexecdir}/%name/libpsm2-compat.cmds
 %dir %{_libdir}/psm2/
 %dir %{_sysconfdir}/modprobe.d
 
-%{_libdir}/psm2/libpsm_infinipath.so.*
+%{_libdir}/libpsm_infinipath.so.*
 %{_udevrulesdir}/40-psm-compat.rules
 %config %{_sysconfdir}/modprobe.d/libpsm2-compat.conf