Accepting request 676925 from home:NMoreyChaisemartin:branches:science:HPC

- Update to 11.2.78 (bsc#1125605)
  - Revert of commit to check free BAR space and release TIDs
  - Remove unnecessary long waiting timeout for HFI driver
- Drop libpsm2-include-ioctl_h.patch which was fixed upstream

OBS-URL: https://build.opensuse.org/request/show/676925
OBS-URL: https://build.opensuse.org/package/show/science:HPC/libpsm2?expand=0&rev=45

_service

@@ -5,11 +5,11 @@
     <param name="package-meta">no</param>
     <param name="exclude">.git</param>
     <param name="filename">libpsm2</param>
-    <param name="version">11.2.23</param>
+    <param name="version">11.2.78</param>
     <param name="versionrewrite-pattern">PSM2_(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
     <param name="match-tag">PSM2_*</param>
-    <param name="revision">8a12e84dc7e3a89eb81f7d0d2fba13c5d9d9c484</param>
+    <param name="revision">816c0dbdf911dba097dcbb09f023c5113713c33e</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">libpsm2*.tar</param>

libpsm2-11.2.23.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14aab45501b1fe91c714befd26d35258ce032540457b230d64b199938d34eecf
-size 367560

libpsm2-11.2.78.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c443e876f79c58c43015a355f7177d749cd2f3499c335baa638874bb6b605739
+size 375470

libpsm2-include-ioctl_h.patch

@@ -1,22 +0,0 @@
-commit 577cf495e26e35e3965b6c43a38ccd84bb10fa52
-Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
-Date:   Mon Nov 20 18:07:42 2017 +0100
-
-    libpsm2 include ioctl_h
-    
-    Fix compilation issue by including ioctl.h
-    
-    Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
-
-diff --git psmi_wrappers.c psmi_wrappers.c
-index ea857fc..f159787 100644
---- psmi_wrappers.c
-+++ psmi_wrappers.c
-@@ -55,6 +55,7 @@
- #include "opa_common.h"
- #include <unistd.h>
- #include "psmi_wrappers.h"
-+#include <sys/ioctl.h>
- 
- /* The following indirection wrappers for external functions
-  * are only created if this is a mocking tests build

libpsm2.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Feb 18 06:29:08 UTC 2019 - nmoreychaisemartin@suse.com
+
+- Update to 11.2.78 (bsc#1125605)
+  - Revert of commit to check free BAR space and release TIDs
+  - Remove unnecessary long waiting timeout for HFI driver
+- Drop libpsm2-include-ioctl_h.patch which was fixed upstream
+
 -------------------------------------------------------------------
 Mon Oct 15 06:43:58 UTC 2018 - nmoreychaisemartin@suse.com
 

libpsm2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libpsm2
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -20,7 +20,7 @@
 
 %define psm_so 2
 Name:           libpsm2
-Version:        11.2.23
+Version:        11.2.78
 Release:        0
 Summary:        Intel PSM Messaging API libraries
 License:        BSD-2-Clause OR GPL-2.0-only
@@ -31,7 +31,6 @@ 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
 BuildRequires:  libnuma-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  pkg-config
@@ -85,7 +84,6 @@ Support for MPIs linked with PSM versions < 2.
 %setup -q -n %{name}-%{version}%{git_ver}
 %patch2
 %patch3
-%patch4
 
 cp %{S:1} ChangeLog
 
@@ -125,9 +123,6 @@ rm  %{buildroot}/%{_libdir}/libpsm2.a
 # The following files were part of the devel-noship and moved to devel:
 %dir %{_includedir}/hfi1diag/
 %dir %{_includedir}/hfi1diag/linux-x86_64/
-%dir %{_includedir}/hfi1diag/ptl_ips/
-
-%{_includedir}/hfi1diag/ptl_ips/ipserror.h
 %{_includedir}/hfi1diag/linux-x86_64/bit_ops.h
 %{_includedir}/hfi1diag/linux-x86_64/sysdep.h
 %_includedir/hfi1diag/hfi1_deprecated.h