Merge with F28 branch, fix FTBFS

-Sync in changes which were only added to the F28 branch
-Add a patch from upstream git to fix FTBFS

0007-terminal-add-include-for-sysmacros.h.patch

@@ -0,0 +1,27 @@
+From e12b5ee34c619e88509f59424068417790b69e04 Mon Sep 17 00:00:00 2001
+From: Sakaki <sakaki@deciban.com>
+Date: Fri, 18 Aug 2017 10:08:23 -0400
+Subject: [PATCH] terminal: add include for sysmacros.h
+
+That file is, in some cases, not included implicitly by sys/types.h.
+
+This commit explicitly includes it.
+---
+ src/libply-splash-core/ply-terminal.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
+index a0954f2..f3b32fe 100644
+--- a/src/libply-splash-core/ply-terminal.c
++++ b/src/libply-splash-core/ply-terminal.c
+@@ -32,6 +32,7 @@
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <termios.h>
+ #include <unistd.h>
+ #include <wchar.h>
+-- 
+2.17.0
+

plymouth.spec

@@ -16,7 +16,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.9.3
-Release: 5%{?snapshot_rel}%{?dist}
+Release: 6%{?snapshot_rel}%{?dist}
 License: GPLv2+
 URL: http://www.freedesktop.org/wiki/Software/Plymouth
 Group: System Environment/Base
@@ -35,6 +35,7 @@ Patch3: 0003-pixel-buffer-Add-the-concept-of-device-rotation.patch
 Patch4: 0004-drm-Check-for-panel-orientation-connector-property.patch
 Patch5: 0005-drm-Reset-primary-plane-rotation-to-DRM_MODE_ROTATE_.patch
 Patch6: 0006-pixel-buffer-switch-device-rotation-to-an-enum.patch
+Patch7: 0007-terminal-add-include-for-sysmacros.h.patch
 
 BuildRequires: pkgconfig(libdrm)
 BuildRequires: pkgconfig(libudev)
@@ -457,10 +458,13 @@ fi
 %files system-theme
 
 %changelog
-* Sun Apr 15 2018 Hans de Goede <jwrdegoede@fedoraproject.org> - 0.9.3-5
+* Sun Apr 15 2018 Hans de Goede <jwrdegoede@fedoraproject.org> - 0.9.3-6
 - Add patches from upstream git for devices with non upright mounted LCD panels
   https://bugs.freedesktop.org/show_bug.cgi?id=104714
 
+* Thu Mar 29 2018 Colin Walters <walters@verbum.org> - 0.9.3-5
+- Drop default boot duration: https://src.fedoraproject.org/rpms/plymouth/pull-request/1
+
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.9.3-4
 - Escape macros in %%changelog