+++ /dev/null
-diff -Nur a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
---- a/src/plugins/splash/text/plugin.c 2015-02-26 19:32:41.000000000 +0100
-+++ b/src/plugins/splash/text/plugin.c 2015-09-10 22:03:27.266902240 +0200
-@@ -174,10 +174,10 @@
- 0x2e3436);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_WHITE,
-- 0xffffff);
-+ 0xCC0A00);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BROWN,
-- 0x979a9b);
-+ 0x880400);
-
- ply_text_display_set_background_color (view->display,
- PLY_TERMINAL_COLOR_BLACK);
--- /dev/null
+@@ -0,0 +1,30 @@
+From 5f1e43c00039a7fe1fff768b91a05a695fb4a53d Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 3 Aug 2022 15:23:33 -0400
+Subject: [PATCH] ply-utils: Drop linux/fs.h include
+
+It was needed long ago for a function we no longer even have.
+
+Now it's causing compile errors on Fedora 37 because it's conflicting
+with sys/mount.h.
+
+This commit drops it.
+---
+ src/libply/ply-utils.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/libply/ply-utils.c b/src/libply/ply-utils.c
+index c7b165e9..219e2e77 100644
+--- a/src/libply/ply-utils.c
++++ b/src/libply/ply-utils.c
+@@ -46,7 +46,6 @@
+ #include <sys/user.h>
+ #include <sys/wait.h>
+ #include <time.h>
+-#include <linux/fs.h>
+ #include <linux/vt.h>
+
+ #include <dlfcn.h>
###############################################################################
name = plymouth
-version = 0.9.2
+version = 22.02.122
release = 1
groups = System/Base
-url = http://www.freedesktop.org/wiki/Software/Plymouth
+url = https://www.freedesktop.org/wiki/Software/Plymouth
license = GPLv2+
-summary = Graphical Boot Animation and Logger.
+summary = Graphical Boot Animation and Logger
description
Plymouth provides an attractive graphical boot animation in
end
source_dl = http://www.freedesktop.org/software/plymouth/releases/
-sources = %{thisapp}.tar.bz2
+sources = %{thisapp}.tar.xz
build
requires
- autoconf
- automake
cairo-devel
docbook-xsl
glib2-devel
- pkgconfig(libdrm)
+ libdrm-devel
+ libffi-devel
libpng-devel
libudev-devel
pango-devel
systemd-devel
+
+ %{datadir}/pixmaps/system-logo-white.png
end
configure_options += \
--libexecdir=/usr/lib \
- --disable-libkms \
--disable-gtk \
- --enable-tracing \
- --disable-tests \
--with-logo=%{datadir}/pixmaps/system-logo-white.png \
--with-background-start-color-stop=0x880400 \
--with-background-end-color-stop=0x000000 \
--with-background-color=0x880400 \
- --disable-gdm-transition \
--enable-systemd-integration \
--without-system-root-install \
- --without-rhgb-compat-link \
- --without-log-viewer
-
- prepare_cmds
- autoreconf -vfi
- end
+ --without-rhgb-compat-link
- # Fix install location for systemd files.
+ # Fix install location for systemd files
make_install_targets += \
SYSTEMD_UNIT_DIR=%{unitdir}
-
- install_cmds
- mkdir -pv %{BUILDROOT}%{datadir}/plymouth
- mkdir -pv %{BUILDROOT}%{localstatedir}/lib/plymouth
- cp -vf %{DIR_SOURCE}/boot-duration \
- %{BUILDROOT}%{datadir}/plymouth/default-boot-duration
- cp -vf %{DIR_SOURCE}/boot-duration \
- %{BUILDROOT}%{localstatedir}/lib/plymouth
-
- # The "glow" theme isn't quite ready for primetime, so drop it.
- rm -rvf %{BUILDROOT}%{datadir}/plymouth/themes/glow
- rm -rvf %{BUILDROOT}%{datadir}/plymouth/glow/
- rm -rvf %{BUILDROOT}%{libdir}/plymouth/glow.so
- end
end
packages
- package %{name}
- groups += Base
+ package %{name}-system-theme
+ summary = Plymouth default theme
+ description
+ This metapackage tracks the current distribution default theme.
+ end
+
+ requires
+ system-logos
+ end
+ end
+
+ package %{name}
prerequires
coreutils
end
%{name}-libs = %{thisver}
%{name}-scripts = %{thisver}
%{name}-system-theme = %{thisver}
- initscripts
end
conflicts
end
script postin
- if [ ! -f "%{localstatedir}/lib/plymouth/boot-duration" ]; then
- cp -f %{datadir}/plymouth/default-boot-duration \
- %{localstatedir}/lib/plymouth/boot-duration
- fi
-
# Just search for new unit files that were just installed.
/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
end
requires += %{name}-plugin-space-flares=%{thisver}
end
- package %{name}-system-theme
- summary = Plymouth default theme.
- description
- This metapackage tracks the current distribution default theme.
- end
-
- groups += Base
-
- requires
- system-logos
- end
-
- # Don't package any files.
- files =
+ package %{name}-debuginfo
+ template DEBUGINFO
end
end