From 0252ca5c6d71934311edafa3224fcb7c33ae5a41a9eb4950590eacc4673bfd16 Mon Sep 17 00:00:00 2001
From: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
Date: Thu, 9 Aug 2018 06:00:28 +0000
Subject: [PATCH] Accepting request 628120 from
 home:Andreas_Schwab:glibc:rebuild

- sysmacros.patch: Include <sys/sysmacros.h> for minor

OBS-URL: https://build.opensuse.org/request/show/628120
OBS-URL: https://build.opensuse.org/package/show/science:HPC/infinipath-psm?expand=0&rev=21
---
 infinipath-psm.changes |  5 +++++
 infinipath-psm.spec    |  5 ++++-
 sysmacros.patch        | 12 ++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 sysmacros.patch

diff --git a/infinipath-psm.changes b/infinipath-psm.changes
index 38b8700..cacd76f 100644
--- a/infinipath-psm.changes
+++ b/infinipath-psm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug  2 09:21:12 UTC 2018 - schwab@suse.de
+
+- sysmacros.patch: Include <sys/sysmacros.h> for minor
+
 -------------------------------------------------------------------
 Sat Jul 14 04:58:35 UTC 2018 - bwiedemann@suse.com
 
diff --git a/infinipath-psm.spec b/infinipath-psm.spec
index 94b5ae2..2013ab0 100644
--- a/infinipath-psm.spec
+++ b/infinipath-psm.spec
@@ -22,7 +22,7 @@ Name:           infinipath-psm
 Version:        3.3
 Release:        0
 Summary:        QLogic PSM Libraries
-License:        BSD-2-Clause or GPL-2.0
+License:        BSD-2-Clause OR GPL-2.0-only
 Group:          Productivity/Networking/System
 Url:            http://www.qlogic.com/
 Source0:        %{name}-%{version}%{git_ver}.tar.gz
@@ -35,6 +35,8 @@ Patch1:         infinipath-psm-no_werror.patch
 Patch3:         infinipath-psm-executable_headers.patch
 # PATCH-FIX-UPSTREAM bmwiedemann https://github.com/intel/psm/pull/16 boo#1047218
 Patch4:         reproducible.patch
+# PATCH-FIX-UPSTREAM Include <sys/sysmacros.h> for minor
+Patch5:         sysmacros.patch
 BuildRequires:  libuuid-devel
 Conflicts:      infinipath-libs
 ExclusiveArch:  %ix86 x86_64
@@ -100,6 +102,7 @@ interfaces in parallel environments.
 %patch1
 %patch3
 %patch4 -p1
+%patch5 -p1
 
 %build
 export RPM_OPT_FLAGS="%{optflags} -Wno-unused-but-set-variable"
diff --git a/sysmacros.patch b/sysmacros.patch
new file mode 100644
index 0000000..19bb967
--- /dev/null
+++ b/sysmacros.patch
@@ -0,0 +1,12 @@
+Index: infinipath-psm-3.3.26.604758e/ipath/ipath_proto.c
+===================================================================
+--- infinipath-psm-3.3.26.604758e.orig/ipath/ipath_proto.c
++++ infinipath-psm-3.3.26.604758e/ipath/ipath_proto.c
+@@ -39,6 +39,7 @@
+ #include <sys/poll.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <stddef.h>