From 749ef2e667254c5267c370c1c39cd053b32ffd5d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 24 Mar 2018 17:47:51 +0000
Subject: [PATCH] Fix for missing major/minor() macros in glibc 2.27.

---
 ...lude-sys-sysmacros.h-for-major-macro.patch | 25 +++++++++++++++++++
 parted.spec                                   |  9 ++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 0001-linux-Include-sys-sysmacros.h-for-major-macro.patch

diff --git a/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch b/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch
new file mode 100644
index 0000000..1c05bb0
--- /dev/null
+++ b/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch
@@ -0,0 +1,25 @@
+From 2d572685e56e46fa10ea25c46185a17e38cb156c Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sat, 24 Mar 2018 17:37:02 +0000
+Subject: [PATCH] linux: Include <sys/sysmacros.h> for major() macro.
+
+Since glibc 2.27 this header is required.
+---
+ libparted/arch/linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
+index 31b98ab..7e86b51 100644
+--- a/libparted/arch/linux.c
++++ b/libparted/arch/linux.c
+@@ -41,6 +41,7 @@
+ #include <sys/utsname.h>        /* for uname() */
+ #include <scsi/scsi.h>
+ #include <assert.h>
++#include <sys/sysmacros.h>
+ #ifdef ENABLE_DEVICE_MAPPER
+ #include <libdevmapper.h>
+ #endif
+-- 
+2.15.1
+
diff --git a/parted.spec b/parted.spec
index d7896e9..869cf2b 100644
--- a/parted.spec
+++ b/parted.spec
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 3.2
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -96,6 +96,10 @@ Patch0079: 0079-atari.c-Drop-xlocale.h-1476934.patch
 Patch0080: 0080-libparted-labels-link-with-libiconv-if-needed.patch
 Patch0081: 0081-Add-support-for-NVDIMM-devices.patch
 
+# Fix for missing major/minor() macros in glibc 2.27.
+# Sent upstream 2018-03-24.
+Patch0099: 0001-linux-Include-sys-sysmacros.h-for-major-macro.patch
+
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc
@@ -231,6 +235,9 @@ fi
 
 
 %changelog
+* Sat Mar 24 2018 Richard W.M. Jones <rjones@redhat.com> - 3.2-32
+- Fix for missing major/minor() macros in glibc 2.27.
+
 * Mon Feb 19 2018 Brian C. Lane <bcl@redhat.com> - 3.2-31
 - Add gcc BuildRequires for future minimal buildroot support
 - Remove %clean section