From 0660c5f99b91561035fcc83684acbb1f31fdc6c1dfa3337578f4bbe0484875b7 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 2 Aug 2018 07:02:45 +0000
Subject: [PATCH] Accepting request 626932 from
 home:Andreas_Schwab:glibc:rebuild

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

OBS-URL: https://build.opensuse.org/request/show/626932
OBS-URL: https://build.opensuse.org/package/show/Base:System/numactl?expand=0&rev=68
---
 numactl.changes |  5 +++++
 numactl.spec    |  9 ++++++---
 sysmacros.patch | 12 ++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 sysmacros.patch

diff --git a/numactl.changes b/numactl.changes
index 957753e..bd3b615 100644
--- a/numactl.changes
+++ b/numactl.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug  1 14:14:39 UTC 2018 - schwab@suse.de
+
+- sysmacros.patch: Include <sys/sysmacros.h> for major/minor
+
 -------------------------------------------------------------------
 Fri Jan  5 15:32:35 UTC 2018 - matwey.kornilov@gmail.com
 
diff --git a/numactl.spec b/numactl.spec
index 5cc82dd..8db5089 100644
--- a/numactl.spec
+++ b/numactl.spec
@@ -20,7 +20,7 @@ Name:           numactl
 Version:        2.0.11
 Release:        0
 Summary:        NUMA Policy Control
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          System/Management
 Url:            http://oss.sgi.com/projects/libnuma/
 Source0:        %{name}-%{version}.tar.xz
@@ -30,6 +30,8 @@ Patch0:         revert_date_in_numastat.patch
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch1:         0001-Fixed-segfault-when-no-node-could-be-found-in-sysfs-.patch
 Patch2:         numactl-clearcache-pie.patch
+# PATCH-FIX-UPSTREAM Include <sys/sysmacros.h> for major/minor
+Patch3:         sysmacros.patch
 %if 0%{?suse_version} > 1110
 BuildRequires:  autoconf >= 2.64
 BuildRequires:  automake
@@ -45,7 +47,7 @@ individual NUMA policy in applications.
 
 %package -n libnuma1
 Summary:        NUMA Policy Control
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          Development/Languages/C and C++
 
 %description -n libnuma1
@@ -54,7 +56,7 @@ individual NUMA policy in applications.
 
 %package -n libnuma-devel
 Summary:        NUMA Policy Control
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          Development/Languages/C and C++
 Requires:       libnuma1 = %{version}
 
@@ -67,6 +69,7 @@ individual NUMA policy in applications.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %if 0%{?suse_version} > 1110
diff --git a/sysmacros.patch b/sysmacros.patch
new file mode 100644
index 0000000..4de31da
--- /dev/null
+++ b/sysmacros.patch
@@ -0,0 +1,12 @@
+Index: numactl-2.0.11/affinity.c
+===================================================================
+--- numactl-2.0.11.orig/affinity.c
++++ numactl-2.0.11/affinity.c
+@@ -40,6 +40,7 @@
+ #include <linux/rtnetlink.h>
+ #include <linux/netlink.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <ctype.h>
+ #include <assert.h>
+ #include <regex.h>