forked from pool/plymouth
Accepting request 822130 from home:qzhao:branches:Base:System
Update to version plymouth-0.9.5+git20200709+ab986a9: main: Don't bail out of load_settings if Theme is missing; main: switch log file when switching mode; two-step: Center message text within labels if labels are centered; Add CI pipeline for Plymouth; Apply suggestion to .gitlab-ci.yml; configure: bump to 0.9.6; configure: quiet a warning; po: drop intltool usage; docs: fix man page cross-reference; Rename 'percent_done' to 'fraction_done' OBS-URL: https://build.opensuse.org/request/show/822130 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=264
This commit is contained in:
Git OBS Bridge
parent
acfd32b5a1
commit
bf63c2ee8e
@ -1,30 +1,7 @@
|
|||||||
From 04fd53750abc1f792ab6d5bdf7416bd7c42451b2 Mon Sep 17 00:00:00 2001
|
diff -Nura plymouth-0.9.5+git20191101+d18086e/configure.ac plymouth-0.9.5+git20191101+d18086e_new/configure.ac
|
||||||
From: Fabian Vogt <fvogt@suse.com>
|
--- plymouth-0.9.5+git20191101+d18086e/configure.ac 2019-11-06 10:19:50.000000000 +0800
|
||||||
Date: Mon, 25 Jan 2016 08:58:03 +0100
|
+++ plymouth-0.9.5+git20191101+d18086e_new/configure.ac 2019-12-14 17:27:03.730000000 +0800
|
||||||
Subject: [PATCH 1/2] Add label-ft plugin
|
@@ -76,6 +76,15 @@
|
||||||
|
|
||||||
This adds a FreeType-based label plugin with minimal dependencies.
|
|
||||||
Is is a replacement for the label plugin, except that it lacks support for
|
|
||||||
Unicode and different fonts families.
|
|
||||||
It's purpose is to be included in the initrd, which isn't easily possible
|
|
||||||
with the label plugin due to it's massive dependency list.
|
|
||||||
|
|
||||||
Signed-off-by: Fabian Vogt <fvogt@suse.com>
|
|
||||||
---
|
|
||||||
configure.ac | 10 +
|
|
||||||
src/libply-splash-graphics/ply-label.c | 5 +
|
|
||||||
src/plugins/controls/Makefile.am | 6 +-
|
|
||||||
src/plugins/controls/label-ft/Makefile.am | 22 ++
|
|
||||||
src/plugins/controls/label-ft/plugin.c | 501 ++++++++++++++++++++++++++++++
|
|
||||||
5 files changed, 543 insertions(+), 1 deletion(-)
|
|
||||||
create mode 100644 src/plugins/controls/label-ft/Makefile.am
|
|
||||||
create mode 100644 src/plugins/controls/label-ft/plugin.c
|
|
||||||
|
|
||||||
Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac
|
|
||||||
===================================================================
|
|
||||||
--- plymouth-0.9.3+git20180807.7663b0c.orig/configure.ac 2018-08-17 19:58:07.106444425 +0200
|
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/configure.ac 2018-08-17 19:58:59.703026810 +0200
|
|
||||||
@@ -69,6 +69,15 @@ if test x$enable_pango = xyes; then
|
|
||||||
AC_SUBST(PANGO_LIBS)
|
AC_SUBST(PANGO_LIBS)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -40,23 +17,19 @@ Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac
|
|||||||
AC_ARG_ENABLE(gtk, AS_HELP_STRING([--enable-gtk],[enable building with gtk, disabled there is no x11 renderer]),enable_gtk=$enableval,enable_gtk=yes)
|
AC_ARG_ENABLE(gtk, AS_HELP_STRING([--enable-gtk],[enable building with gtk, disabled there is no x11 renderer]),enable_gtk=$enableval,enable_gtk=yes)
|
||||||
AM_CONDITIONAL(ENABLE_GTK, [test "$enable_gtk" = yes])
|
AM_CONDITIONAL(ENABLE_GTK, [test "$enable_gtk" = yes])
|
||||||
|
|
||||||
@@ -308,6 +317,7 @@ AC_CONFIG_FILES([Makefile
|
@@ -318,6 +327,7 @@
|
||||||
src/plugins/splash/script/Makefile
|
src/plugins/splash/script/Makefile
|
||||||
src/plugins/controls/Makefile
|
src/plugins/controls/Makefile
|
||||||
src/plugins/controls/label/Makefile
|
src/plugins/controls/label/Makefile
|
||||||
+ src/plugins/controls/label-ft/Makefile
|
+ src/plugins/controls/label-ft/Makefile
|
||||||
src/Makefile
|
src/Makefile
|
||||||
src/client/ply-boot-client.pc
|
src/client/ply-boot-client.pc
|
||||||
src/client/Makefile
|
src/client/Makefile
|
||||||
Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c
|
diff -Nura plymouth-0.9.5+git20191101+d18086e/src/libply-splash-graphics/ply-label.c plymouth-0.9.5+git20191101+d18086e_new/src/libply-splash-graphics/ply-label.c
|
||||||
===================================================================
|
--- plymouth-0.9.5+git20191101+d18086e/src/libply-splash-graphics/ply-label.c 2019-10-22 15:31:17.000000000 +0800
|
||||||
--- plymouth-0.9.3+git20180807.7663b0c.orig/src/libply-splash-graphics/ply-label.c 2018-08-07 17:41:15.000000000 +0200
|
+++ plymouth-0.9.5+git20191101+d18086e_new/src/libply-splash-graphics/ply-label.c 2019-12-14 17:23:10.796000000 +0800
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c 2018-08-17 19:58:59.703026810 +0200
|
@@ -98,6 +98,10 @@
|
||||||
@@ -96,8 +96,13 @@ ply_label_load_plugin (ply_label_t *labe
|
|
||||||
|
|
||||||
get_plugin_interface_function_t get_label_plugin_interface;
|
|
||||||
|
|
||||||
+ /* Try the pango/cairo based label plugin first... */
|
|
||||||
label->module_handle = ply_open_module (PLYMOUTH_PLUGIN_PATH "label.so");
|
label->module_handle = ply_open_module (PLYMOUTH_PLUGIN_PATH "label.so");
|
||||||
|
|
||||||
+ /* ...and the FreeType based one after that, it is not a complete substitute (yet). */
|
+ /* ...and the FreeType based one after that, it is not a complete substitute (yet). */
|
||||||
@ -66,24 +39,9 @@ Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c
|
|||||||
if (label->module_handle == NULL)
|
if (label->module_handle == NULL)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/Makefile.am
|
diff -Nura plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/Makefile.am plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/Makefile.am
|
||||||
===================================================================
|
--- plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/Makefile.am 1970-01-01 08:00:00.000000000 +0800
|
||||||
--- plymouth-0.9.3+git20180807.7663b0c.orig/src/plugins/controls/Makefile.am 2018-08-07 17:41:15.000000000 +0200
|
+++ plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/Makefile.am 2019-12-14 17:17:26.473000000 +0800
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/Makefile.am 2018-08-17 19:58:59.703026810 +0200
|
|
||||||
@@ -1,4 +1,8 @@
|
|
||||||
+SUBDIRS =
|
|
||||||
if ENABLE_PANGO
|
|
||||||
-SUBDIRS = label
|
|
||||||
+SUBDIRS += label
|
|
||||||
+endif
|
|
||||||
+if ENABLE_FREETYPE
|
|
||||||
+SUBDIRS += label-ft
|
|
||||||
endif
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
|
||||||
Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/Makefile.am 2018-08-17 19:58:59.703026810 +0200
|
|
||||||
@@ -0,0 +1,22 @@
|
@@ -0,0 +1,22 @@
|
||||||
+AM_CPPFLAGS = -I$(top_srcdir) \
|
+AM_CPPFLAGS = -I$(top_srcdir) \
|
||||||
+ -I$(srcdir)/../../../libply \
|
+ -I$(srcdir)/../../../libply \
|
||||||
@ -107,10 +65,9 @@ Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/Makefile
|
|||||||
+label_ft_la_SOURCES = $(srcdir)/plugin.c
|
+label_ft_la_SOURCES = $(srcdir)/plugin.c
|
||||||
+
|
+
|
||||||
+MAINTAINERCLEANFILES = Makefile.in
|
+MAINTAINERCLEANFILES = Makefile.in
|
||||||
Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c
|
diff -Nura plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/plugin.c plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/plugin.c
|
||||||
===================================================================
|
--- plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/label-ft/plugin.c 1970-01-01 08:00:00.000000000 +0800
|
||||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
+++ plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/plugin.c 2019-12-14 17:17:26.475000000 +0800
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c 2018-08-17 19:58:59.703026810 +0200
|
|
||||||
@@ -0,0 +1,507 @@
|
@@ -0,0 +1,507 @@
|
||||||
+/* ply-label.c - label control
|
+/* ply-label.c - label control
|
||||||
+ *
|
+ *
|
||||||
@ -619,3 +576,16 @@ Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
|
+/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
|
||||||
|
diff -Nura plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/Makefile.am plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/Makefile.am
|
||||||
|
--- plymouth-0.9.5+git20191101+d18086e/src/plugins/controls/Makefile.am 2019-10-22 15:31:17.000000000 +0800
|
||||||
|
+++ plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/Makefile.am 2019-12-14 17:20:38.575000000 +0800
|
||||||
|
@@ -1,4 +1,8 @@
|
||||||
|
+SUBDIRS =
|
||||||
|
if ENABLE_PANGO
|
||||||
|
-SUBDIRS = label
|
||||||
|
+SUBDIRS += label
|
||||||
|
+endif
|
||||||
|
+if ENABLE_FREETYPE
|
||||||
|
+SUBDIRS += label-ft
|
||||||
|
endif
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
diff -Nura plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.in plymouth-0.9.4+git20190304.ed9f201_new/scripts/plymouth-populate-initrd.in
|
diff -Nura plymouth-0.9.5+git20191101+d18086e/scripts/plymouth-populate-initrd.in plymouth-0.9.5+git20191101+d18086e_new/scripts/plymouth-populate-initrd.in
|
||||||
--- plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.in 2019-03-12 20:11:18.845236943 +0800
|
--- plymouth-0.9.5+git20191101+d18086e/scripts/plymouth-populate-initrd.in 2019-11-06 10:19:50.000000000 +0800
|
||||||
+++ plymouth-0.9.4+git20190304.ed9f201_new/scripts/plymouth-populate-initrd.in 2019-03-12 20:25:34.933746928 +0800
|
+++ plymouth-0.9.5+git20191101+d18086e_new/scripts/plymouth-populate-initrd.in 2019-12-14 18:28:06.448000000 +0800
|
||||||
@@ -433,6 +433,15 @@
|
@@ -461,6 +461,15 @@
|
||||||
inst_recur "${PLYMOUTH_IMAGE_DIR}"
|
inst_recur "${PLYMOUTH_IMAGE_DIR}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -14,6 +14,6 @@ diff -Nura plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.i
|
|||||||
+ ln -s "$font" $INITRDDIR/usr/share/fonts/Plymouth.ttf
|
+ ln -s "$font" $INITRDDIR/usr/share/fonts/Plymouth.ttf
|
||||||
+fi
|
+fi
|
||||||
+
|
+
|
||||||
if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then
|
if [ -L ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then
|
||||||
cp -a ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes
|
cp -a ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:15e017611ca3181c4d5b50510628b62c9c97009cf10f3a38fb6ba960429cfd09
|
|
||||||
size 5774076
|
|
||||||
3
plymouth-0.9.5+git20200709+ab986a9.tar.xz
Normal file
3
plymouth-0.9.5+git20200709+ab986a9.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:245140dd9f072f8e4ebdc816facd4d050f8fe411d9afc06f7fde728857e95d26
|
||||||
|
size 6581548
|
||||||
@ -1,19 +0,0 @@
|
|||||||
diff -Nura plymouth-0.9.5+git20190908+3abfab2/src/libply/ply-terminal-session.c plymouth-0.9.5+git20190908+3abfab2_new/src/libply/ply-terminal-session.c
|
|
||||||
--- plymouth-0.9.5+git20190908+3abfab2/src/libply/ply-terminal-session.c 2019-09-09 07:31:37.000000000 +0000
|
|
||||||
+++ plymouth-0.9.5+git20190908+3abfab2_new/src/libply/ply-terminal-session.c 2019-09-11 07:41:17.432945317 +0000
|
|
||||||
@@ -183,6 +183,7 @@
|
|
||||||
|
|
||||||
ply_trace (" opened device '/dev/ptmx'");
|
|
||||||
|
|
||||||
+#if 0
|
|
||||||
ply_trace ("creating pseudoterminal");
|
|
||||||
if (grantpt (session->pseudoterminal_master_fd) < 0) {
|
|
||||||
ply_save_errno ();
|
|
||||||
@@ -192,6 +193,7 @@
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
ply_trace ("done creating pseudoterminal");
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
ply_trace ("unlocking pseudoterminal");
|
|
||||||
if (unlockpt (session->pseudoterminal_master_fd) < 0) {
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac
|
|
||||||
===================================================================
|
|
||||||
--- plymouth-0.9.3+git20180807.7663b0c.orig/configure.ac 2018-08-07 17:41:15.000000000 +0200
|
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/configure.ac 2018-08-17 19:58:07.106444425 +0200
|
|
||||||
@@ -150,7 +150,7 @@ if test x$with_system_root_install = xye
|
|
||||||
else
|
|
||||||
plymouthclientdir=$bindir
|
|
||||||
plymouthdaemondir=$sbindir
|
|
||||||
- plymouthruntimedir=$localstatedir/run/plymouth
|
|
||||||
+ plymouthruntimedir=/run/plymouth
|
|
||||||
fi
|
|
||||||
AC_SUBST(plymouthclientdir)
|
|
||||||
AC_SUBST(plymouthdaemondir)
|
|
||||||
14
plymouth-disable-fedora-bizcom-theme.patch
Normal file
14
plymouth-disable-fedora-bizcom-theme.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff -Nura plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/src/plugins/splash/Makefile.am
|
||||||
|
--- plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/Makefile.am 2020-01-02 17:03:18.000000000 +0800
|
||||||
|
+++ plymouth-0.9.5+git20191224+d7c737d_new/src/plugins/splash/Makefile.am 2020-04-10 22:35:52.759365963 +0800
|
||||||
|
@@ -1,2 +1,2 @@
|
||||||
|
-SUBDIRS = fade-throbber text details space-flares two-step script tribar
|
||||||
|
+SUBDIRS = text details two-step script tribar
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
diff -Nura plymouth-0.9.5+git20191224+d7c737d/themes/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/themes/Makefile.am
|
||||||
|
--- plymouth-0.9.5+git20191224+d7c737d/themes/Makefile.am 2020-01-02 17:03:18.000000000 +0800
|
||||||
|
+++ plymouth-0.9.5+git20191224+d7c737d_new/themes/Makefile.am 2020-04-10 21:07:15.395978166 +0800
|
||||||
|
@@ -1,2 +1,2 @@
|
||||||
|
-SUBDIRS = spinfinity fade-in text details solar glow script spinner tribar bgrt
|
||||||
|
+SUBDIRS = spinfinity text details script spinner tribar bgrt
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
9
plymouth-disable-fedora-logo.patch
Normal file
9
plymouth-disable-fedora-logo.patch
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
diff -Nura plymouth-0.9.5+git20191224+d7c737d/themes/spinfinity/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/themes/spinfinity/Makefile.am
|
||||||
|
--- plymouth-0.9.5+git20191224+d7c737d/themes/spinfinity/Makefile.am 2020-01-02 17:03:18.000000000 +0800
|
||||||
|
+++ plymouth-0.9.5+git20191224+d7c737d_new/themes/spinfinity/Makefile.am 2020-04-06 10:15:05.040164493 +0800
|
||||||
|
@@ -54,4 +54,4 @@
|
||||||
|
EXTRA_DIST = spinfinity.plymouth.in
|
||||||
|
|
||||||
|
install-data-hook:
|
||||||
|
- ln -sf /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(themedir)/header-image.png
|
||||||
|
+
|
||||||
@ -1,15 +0,0 @@
|
|||||||
Index: plymouth-0.9.3+git20180807.7663b0c/scripts/plymouth-populate-initrd.in
|
|
||||||
===================================================================
|
|
||||||
--- plymouth-0.9.3+git20180807.7663b0c.orig/scripts/plymouth-populate-initrd.in 2018-08-07 17:41:15.000000000 +0200
|
|
||||||
+++ plymouth-0.9.3+git20180807.7663b0c/scripts/plymouth-populate-initrd.in 2018-08-17 19:57:27.334004329 +0200
|
|
||||||
@@ -386,8 +386,8 @@ done
|
|
||||||
[ -z "$INITRDDIR" ] && usage error
|
|
||||||
|
|
||||||
mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
|
|
||||||
-inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR
|
|
||||||
-inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR
|
|
||||||
+inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /usr/sbin/plymouthd
|
|
||||||
+inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /usr/bin/plymouth
|
|
||||||
inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
|
|
||||||
inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
|
|
||||||
inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR
|
|
||||||
13
plymouth-ignore-serial-console.patch
Normal file
13
plymouth-ignore-serial-console.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff -Nura plymouth-0.9.5+git20191224+d7c737d/src/main.c plymouth-0.9.5+git20191224+d7c737d_new/src/main.c
|
||||||
|
--- plymouth-0.9.5+git20191224+d7c737d/src/main.c 2020-01-02 17:03:18.000000000 +0800
|
||||||
|
+++ plymouth-0.9.5+git20191224+d7c737d_new/src/main.c 2020-04-11 12:34:22.295210835 +0800
|
||||||
|
@@ -2241,8 +2241,7 @@
|
||||||
|
find_system_default_splash (&state);
|
||||||
|
find_distribution_default_splash (&state);
|
||||||
|
|
||||||
|
- if (ply_kernel_command_line_has_argument ("plymouth.ignore-serial-consoles"))
|
||||||
|
- device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES;
|
||||||
|
+ device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES;
|
||||||
|
|
||||||
|
if (ply_kernel_command_line_has_argument ("plymouth.ignore-udev") ||
|
||||||
|
(getenv ("DISPLAY") != NULL))
|
||||||
47
plymouth-only_use_fb_for_cirrus_bochs.patch
Normal file
47
plymouth-only_use_fb_for_cirrus_bochs.patch
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
From: Fabian Vogt <fvogt@suse.com>
|
||||||
|
Subject: force fb for cirrus and bochs, force drm otherwise
|
||||||
|
References: bsc#888590, bsc#980750
|
||||||
|
|
||||||
|
DRM does not work well with cirrus and bochs (no display) but the framebuffer driver
|
||||||
|
prevents DRM drivers from loading.
|
||||||
|
As we need to support cirrus for libvirt and bochs for QEMU, we cannot just remove support for frame-buffer.
|
||||||
|
|
||||||
|
Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-core/ply-device-manager.c
|
||||||
|
===================================================================
|
||||||
|
--- plymouth-0.9.3+git20180807.7663b0c.orig/src/libply-splash-core/ply-device-manager.c 2018-08-07 17:41:15.000000000 +0200
|
||||||
|
+++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-core/ply-device-manager.c 2018-08-17 19:58:41.178821647 +0200
|
||||||
|
@@ -228,13 +228,33 @@ create_devices_for_udev_device (ply_devi
|
||||||
|
subsystem = udev_device_get_subsystem (device);
|
||||||
|
ply_trace ("device subsystem is %s", subsystem);
|
||||||
|
|
||||||
|
+ const char *card_vendor = udev_device_get_sysattr_value (device, "device/vendor");
|
||||||
|
+ const char *card_device = udev_device_get_sysattr_value (device, "device/device");
|
||||||
|
+ bool use_fb = false;
|
||||||
|
+ if (card_vendor) {
|
||||||
|
+ /* Cirrus */
|
||||||
|
+ if (strcmp ("0x1013", card_vendor) == 0)
|
||||||
|
+ use_fb = true;
|
||||||
|
+ /* "Technical Corp", also used by bochs */
|
||||||
|
+ else if (strcmp ("0x1234", card_vendor) == 0)
|
||||||
|
+ use_fb = strcmp("0x1111", card_device) == 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (subsystem != NULL && strcmp (subsystem, SUBSYSTEM_DRM) == 0) {
|
||||||
|
ply_trace ("found DRM device %s", device_path);
|
||||||
|
renderer_type = PLY_RENDERER_TYPE_DRM;
|
||||||
|
+ if (use_fb) {
|
||||||
|
+ ply_trace ("forcing use of framebuffer for cirrusdrmfb");
|
||||||
|
+ renderer_type = PLY_RENDERER_TYPE_NONE;
|
||||||
|
+ }
|
||||||
|
} else if (strcmp (subsystem, SUBSYSTEM_FRAME_BUFFER) == 0) {
|
||||||
|
ply_trace ("found frame buffer device %s", device_path);
|
||||||
|
- if (!fb_device_has_drm_device (manager, device))
|
||||||
|
+ if (use_fb) {
|
||||||
|
renderer_type = PLY_RENDERER_TYPE_FRAME_BUFFER;
|
||||||
|
+ }
|
||||||
|
+ else if (!fb_device_has_drm_device (manager, device)) {
|
||||||
|
+ ply_trace ("avoiding use of framebuffer to not block DRM drivers from working");
|
||||||
|
+ }
|
||||||
|
else
|
||||||
|
ply_trace ("ignoring, since there's a DRM device associated with it");
|
||||||
|
}
|
||||||
@ -1,4 +1,19 @@
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
|
Sun Jul 19 15:51:56 UTC 2020 - Cliff Zhao <qzhao@suse.com>
|
||||||
|
|
||||||
|
- Update to version plymouth-0.9.5+git20200709+ab986a9:
|
||||||
|
main: Don't bail out of load_settings if "Theme" is missing
|
||||||
|
main: switch log file when switching mode
|
||||||
|
two-step: Center message text within labels if labels are centered
|
||||||
|
Add CI pipeline for Plymouth
|
||||||
|
Apply suggestion to .gitlab-ci.yml
|
||||||
|
configure: bump to 0.9.6
|
||||||
|
configure: quiet a warning
|
||||||
|
po: drop intltool usage
|
||||||
|
docs: fix man page cross-reference
|
||||||
|
Rename 'percent_done' to 'fraction_done'
|
||||||
|
|
||||||
|
------------------------------------------------------------------
|
||||||
Mon Jun 15 13:54:25 UTC 2020 - Cliff Zhao <qzhao@suse.com>
|
Mon Jun 15 13:54:25 UTC 2020 - Cliff Zhao <qzhao@suse.com>
|
||||||
|
|
||||||
- Drop plymouth-only_use_fb_for_cirrus_bochs.patch: openSUSE user
|
- Drop plymouth-only_use_fb_for_cirrus_bochs.patch: openSUSE user
|
||||||
@ -6,6 +21,79 @@ Mon Jun 15 13:54:25 UTC 2020 - Cliff Zhao <qzhao@suse.com>
|
|||||||
Plymouth theme with script module fails to go to graphic mode
|
Plymouth theme with script module fails to go to graphic mode
|
||||||
with this patch(boo#1172028).
|
with this patch(boo#1172028).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Apr 24 07:39:59 UTC 2020 - Cliff Zhao <qzhao@suse.com>
|
||||||
|
|
||||||
|
- Update to version 0.9.5+git20200418+14e91cc:
|
||||||
|
Don't bail out of load_settings if "Theme" is missing.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Apr 11 05:11:27 UTC 2020 - Cliff Zhao <qzhao@suse.com>
|
||||||
|
|
||||||
|
- Update to version plymouth-0.9.5+git20200407+6ca4b5b:
|
||||||
|
plymouthd: fix mode changing before splash is shown.
|
||||||
|
two-step: Center message text within labels if labels are
|
||||||
|
centered.
|
||||||
|
drm: Do not unnecessarily get output info twice.
|
||||||
|
ply-device-manager: Only consume one udev event at a time.
|
||||||
|
two-step: Do not jump to end-animation on halt/reboot if it is
|
||||||
|
disabled
|
||||||
|
two-step: Add UseEndAnimation setting.
|
||||||
|
- Add plymouth-ignore-serial-console.patch:
|
||||||
|
Don't output in serial console for openQA need to take serial in
|
||||||
|
the test, and yast-installation prgram has a feature to install
|
||||||
|
system through it (bnc#1164123).
|
||||||
|
- Add plymouth-disable-fedora-bizcom-theme.patch:
|
||||||
|
Will not compile fedora related theme packages, which openSUSE
|
||||||
|
don't need.
|
||||||
|
- Drop plymouth-avoid-umount-hanging-shutdown.patch:
|
||||||
|
Already merged to upstream.
|
||||||
|
- Drop boot-duration:
|
||||||
|
this is an empty file which can generated after package building.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Feb 13 19:25:54 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
|
- Remove gnu-unifont-bitmap-font runtime dependency, it is not
|
||||||
|
used anywhere.
|
||||||
|
- Replace autosetup -S git by setup + autopatch, remove git
|
||||||
|
build dependency.
|
||||||
|
- Remove unused kernel-headers and module-init-tools build deps.
|
||||||
|
- Make plymouth-scripts noarch (installed in /usr/lib), adjust
|
||||||
|
its runtime dependencies.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Jan 5 04:01:42 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
|
- Fix spinfinity Requires, throbgress is no longer available,
|
||||||
|
but the two-step plugin has gained the required capabilities.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 24 08:49:24 UTC 2019 - Cliff Zhao <qzhao@suse.com>
|
||||||
|
|
||||||
|
- Update to version plymouth-0.9.5+git20191224+d7c737d:
|
||||||
|
* drm: Keep hw-rotation on devices with upside down LCD panels
|
||||||
|
* themes: spinner/bgrt: Modify password dialog to match gnome
|
||||||
|
3.34 changes
|
||||||
|
* two-step: Change keyboard-indicator positioning to fixed
|
||||||
|
offset below dialog
|
||||||
|
* two-step: Fix wrong horizontal position of bgrt logo on
|
||||||
|
left-side-up LCD panels
|
||||||
|
* drm: Mark buffer as clean in ply_renderer_head_new()
|
||||||
|
* throbgress: Remove the throbgress plugin
|
||||||
|
* boot-splash: fix memory leak in error path.
|
||||||
|
- Add plymouth-disable-fedora-logo.patch:
|
||||||
|
Disable the logo file which links to fedora custom position,
|
||||||
|
and openSUSE don't have it.
|
||||||
|
- Drop plymouth-dracut-path.patch:
|
||||||
|
Nolonger needed for the latest update.
|
||||||
|
- Drop plymouth-correct-runtime-dir.patch:
|
||||||
|
Nolonger needed for the latest update.
|
||||||
|
- Porting old patches to fit the latest update.
|
||||||
|
0001-Add-label-ft-plugin.patch
|
||||||
|
0002-Install-label-ft-plugin-into-initrd-if-available.patch
|
||||||
|
- Upstream dropped theme throbgress, So we nolonger build it.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Oct 30 19:21:08 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
Wed Oct 30 19:21:08 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
@ -17,8 +105,7 @@ Wed Sep 11 07:54:48 UTC 2019 - Cliff Zhao <qzhao@suse.com>
|
|||||||
|
|
||||||
- Add patch plymouth-avoid-umount-hanging-shutdown.patch:
|
- Add patch plymouth-avoid-umount-hanging-shutdown.patch:
|
||||||
To avoid grantpt() call nsslookup, it will hanging system unmount
|
To avoid grantpt() call nsslookup, it will hanging system unmount
|
||||||
/var during shutdown period(bsc#1105688, bsc#1129386,
|
/var during shutdown period(bsc#1105688,bsc#1129386,bsc#1134660).
|
||||||
bsc#1134660).
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Aug 15 03:56:10 UTC 2019 - Cliff Zhao <qzhao@suse.com>
|
Thu Aug 15 03:56:10 UTC 2019 - Cliff Zhao <qzhao@suse.com>
|
||||||
|
|||||||
583
plymouth.spec
583
plymouth.spec
@ -16,56 +16,43 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
# plymouth's X11 renderer adds many GTK3 packages to the build cycle,
|
|
||||||
# it is not used in the production environment.
|
|
||||||
%bcond_with x11_renderer
|
%bcond_with x11_renderer
|
||||||
|
%bcond_with fedora_theme
|
||||||
|
|
||||||
%global soversion 5
|
%global git_version 20200709+ab986a9
|
||||||
%define plymouthdaemon_execdir %{_sbindir}
|
%global so_version 5
|
||||||
%define plymouthclient_execdir %{_bindir}
|
|
||||||
%define plymouth_libdir %{_libdir}
|
|
||||||
%define plymouth_initrd_file /boot/initrd-plymouth.img
|
|
||||||
|
|
||||||
Name: plymouth
|
Name: plymouth
|
||||||
Version: 0.9.5+git20190908+3abfab2
|
Version: 0.9.5+git%{git_version}
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Graphical Boot Animation and Logger
|
Summary: Graphical Boot Animation and Logger
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
URL: http://www.freedesktop.org/wiki/Software/Plymouth
|
URL: https://www.freedesktop.org/wiki/Software/Plymouth
|
||||||
|
|
||||||
Source0: %{name}-%{version}.tar.xz
|
Source0: %{name}-%{version}.tar.xz
|
||||||
Source1: boot-duration
|
|
||||||
# PATCH-FIX-OPENSUSE plymouth-dracut-path.patch tittiatcoke@gmail.com -- Prefix is /usr/sbin and /usr/bin
|
|
||||||
Patch0: plymouth-dracut-path.patch
|
|
||||||
# PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com -- To use suse colors in tribar.
|
# PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com -- To use suse colors in tribar.
|
||||||
Patch1: plymouth-some-greenish-openSUSE-colors.patch
|
Patch0: plymouth-some-greenish-openSUSE-colors.patch
|
||||||
# PATCH-FIX-OPENSUSE plymouth-correct-runtime-dir.patch tittiatcoke@gmail.com -- Make sure the runtime directory is /run and not /var/run
|
# PATCH-FIX-OPENSUSE plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation
|
||||||
Patch2: plymouth-correct-runtime-dir.patch
|
Patch1: plymouth-manpages.patch
|
||||||
# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation
|
# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE.
|
||||||
Patch3: plymouth-manpages.patch
|
Patch2: plymouth-disable-fedora-logo.patch
|
||||||
# PATCH-FIX-OPENSUSE plymouth-avoid-umount-hanging-shutdown.patch bnc#1105688, bnc#1129386, bnc#1134660 qzhao@opensuse.org -- Drop grantpt() to avoid system failed to unmount /var during shutdown.
|
# PATCH-FIX-OPENSUSE plymouth-disable-fedora-bizcom-theme.patch qzhao@opensuse.org -- Disable to compile fedora related themes.
|
||||||
Patch4: plymouth-avoid-umount-hanging-shutdown.patch
|
Patch3: plymouth-disable-fedora-bizcom-theme.patch
|
||||||
|
# PATCH-FIX-OPENSUSE plymouth-ignore-serial-console.patch qzhao@opensuse.org bnc#1164123 -- Don't output in serial console for openQA need to take serial in the test, and yast-installation prgram has a feature to install system through it.
|
||||||
|
Patch4: plymouth-ignore-serial-console.patch
|
||||||
# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
||||||
Patch1000: 0001-Add-label-ft-plugin.patch
|
Patch1000: 0001-Add-label-ft-plugin.patch
|
||||||
# PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
# PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
||||||
Patch1001: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
|
Patch1001: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
|
||||||
# PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
# PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
||||||
Patch1002: 0003-fix_null_deref.patch
|
Patch1002: 0003-fix_null_deref.patch
|
||||||
|
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: docbook-xsl-stylesheets
|
BuildRequires: docbook-xsl-stylesheets
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: git
|
BuildRequires: intltool
|
||||||
BuildRequires: kernel-headers
|
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: libxslt
|
BuildRequires: libxslt
|
||||||
BuildRequires: module-init-tools
|
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: suse-module-tools
|
|
||||||
# needed for systemd-tty-ask-password-agent
|
|
||||||
BuildRequires: intltool
|
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: xz
|
BuildRequires: xz
|
||||||
BuildRequires: pkgconfig(cairo)
|
BuildRequires: pkgconfig(cairo)
|
||||||
@ -78,15 +65,18 @@ BuildRequires: pkgconfig(systemd) >= 186
|
|||||||
%if %{with x11_renderer}
|
%if %{with x11_renderer}
|
||||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
|
BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{suse_version} >= 1550
|
||||||
|
# regenerate_initrd_post moved to rpm-config-SUSE:initrd.macros
|
||||||
|
BuildRequires: rpm-config-SUSE >= 0.g11
|
||||||
|
%else
|
||||||
|
BuildRequires: suse-module-tools
|
||||||
|
%endif
|
||||||
Recommends: %{name}-lang
|
Recommends: %{name}-lang
|
||||||
Requires: %{name}-branding
|
Requires: %{name}-branding
|
||||||
Requires: gnu-unifont-bitmap-fonts
|
|
||||||
Requires: systemd >= 186
|
Requires: systemd >= 186
|
||||||
Requires(post): coreutils
|
Requires(post): coreutils
|
||||||
Requires(post): plymouth-scripts = %{version}
|
Requires(post): plymouth-scripts = %{version}
|
||||||
Requires(postun): coreutils
|
Requires(postun): coreutils
|
||||||
Recommends: plymouth-plugin-label-ft
|
|
||||||
Suggests: plymouth-plugin-label
|
Suggests: plymouth-plugin-label
|
||||||
Provides: bootsplash = 3.5
|
Provides: bootsplash = 3.5
|
||||||
Obsoletes: bootsplash < 3.5
|
Obsoletes: bootsplash < 3.5
|
||||||
@ -99,36 +89,50 @@ place of the text messages that normally get shown. Text
|
|||||||
messages are instead redirected to a log file for viewing
|
messages are instead redirected to a log file for viewing
|
||||||
after boot.
|
after boot.
|
||||||
|
|
||||||
%package -n libply-boot-client%{soversion}
|
%package -n plymouth-branding-upstream
|
||||||
|
Summary: Plymouth core library
|
||||||
|
Group: System/Base
|
||||||
|
Requires: %{name} = %{version}
|
||||||
|
Provides: %{name}-branding = %{version}
|
||||||
|
Conflicts: otherproviders(%{name}-branding)
|
||||||
|
Supplements: packageand(%{name}:branding-upstream)
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description -n plymouth-branding-upstream
|
||||||
|
Plymouth provides an attractive graphical boot animation in
|
||||||
|
place of the text messages that normally get shown. This
|
||||||
|
package provides the upstream default configuration for plymouth.
|
||||||
|
|
||||||
|
%package -n libply-boot-client%{so_version}
|
||||||
Summary: Plymouth core library
|
Summary: Plymouth core library
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
|
|
||||||
%description -n libply-boot-client%{soversion}
|
%description -n libply-boot-client%{so_version}
|
||||||
This package contains the libply-boot-client library used by Plymouth.
|
This package contains the libply-boot-client library used by Plymouth.
|
||||||
|
|
||||||
%package -n libply-splash-core%{soversion}
|
%package -n libply-splash-core%{so_version}
|
||||||
Summary: Plymouth core library
|
Summary: Plymouth core library
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
|
|
||||||
%description -n libply-splash-core%{soversion}
|
%description -n libply-splash-core%{so_version}
|
||||||
This package contains the libply-splash-core library
|
This package contains the libply-splash-core library
|
||||||
used by graphical Plymouth splashes.
|
used by graphical Plymouth splashes.
|
||||||
|
|
||||||
%package -n libply-splash-graphics%{soversion}
|
%package -n libply-splash-graphics%{so_version}
|
||||||
Summary: Plymouth graphics libraries
|
Summary: Plymouth graphics libraries
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
BuildRequires: libpng-devel
|
BuildRequires: libpng-devel
|
||||||
|
|
||||||
%description -n libply-splash-graphics%{soversion}
|
%description -n libply-splash-graphics%{so_version}
|
||||||
This package contains the libply-splash-graphics library
|
This package contains the libply-splash-graphics library
|
||||||
used by graphical Plymouth splashes.
|
used by graphical Plymouth splashes.
|
||||||
|
|
||||||
%package -n libply%{soversion}
|
%package -n libply%{so_version}
|
||||||
Summary: Plymouth core library
|
Summary: Plymouth core library
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Requires: libply-boot-client%{soversion} = %{version}
|
Requires: libply-boot-client%{so_version} = %{version}
|
||||||
|
|
||||||
%description -n libply%{soversion}
|
%description -n libply%{so_version}
|
||||||
This package contains the libply library used by Plymouth.
|
This package contains the libply library used by Plymouth.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
@ -138,10 +142,10 @@ Requires: %{name} = %{version}
|
|||||||
%if %{with x11_renderer}
|
%if %{with x11_renderer}
|
||||||
Requires: %{name}-x11-renderer = %{version}
|
Requires: %{name}-x11-renderer = %{version}
|
||||||
%endif
|
%endif
|
||||||
Requires: libply%{soversion} = %{version}
|
Requires: libply%{so_version} = %{version}
|
||||||
Requires: libply-boot-client%{soversion} = %{version}
|
Requires: libply-boot-client%{so_version} = %{version}
|
||||||
Requires: libply-splash-core%{soversion} = %{version}
|
Requires: libply-splash-core%{so_version} = %{version}
|
||||||
Requires: libply-splash-graphics%{soversion} = %{version}
|
Requires: libply-splash-graphics%{so_version} = %{version}
|
||||||
Requires: pkgconfig
|
Requires: pkgconfig
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
@ -157,24 +161,15 @@ Supplements: packageand(plymouth:dracut)
|
|||||||
%description dracut
|
%description dracut
|
||||||
This package contains utilities that integrate dracut with Plymouth
|
This package contains utilities that integrate dracut with Plymouth
|
||||||
|
|
||||||
%package x11-renderer
|
|
||||||
Summary: Plymouth X11 renderer
|
|
||||||
Group: System/Base
|
|
||||||
Requires: %{name} = %{version}
|
|
||||||
|
|
||||||
%description x11-renderer
|
|
||||||
This package provides the X11 renderer which allows to test plymouth
|
|
||||||
behavior on environments with a valid DISPLAY.
|
|
||||||
|
|
||||||
%package scripts
|
%package scripts
|
||||||
Summary: Plymouth related scripts
|
Summary: Plymouth related scripts
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
Requires: coreutils
|
Requires: awk
|
||||||
Requires: cpio
|
|
||||||
Requires: dracut
|
Requires: dracut
|
||||||
Requires: findutils
|
Requires: grep
|
||||||
Requires: gzip
|
Requires: sed
|
||||||
Requires(pre): %{name} = %{version}
|
Requires(pre): %{name} = %{version}
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
%description scripts
|
%description scripts
|
||||||
This package contains scripts that help integrate Plymouth with
|
This package contains scripts that help integrate Plymouth with
|
||||||
@ -183,7 +178,7 @@ the system.
|
|||||||
%package plugin-label
|
%package plugin-label
|
||||||
Summary: Plymouth label plugin
|
Summary: Plymouth label plugin
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
Requires: libply-splash-graphics%{soversion} = %{version}
|
Requires: libply-splash-graphics%{so_version} = %{version}
|
||||||
|
|
||||||
%description plugin-label
|
%description plugin-label
|
||||||
This package contains the label control plugin for
|
This package contains the label control plugin for
|
||||||
@ -194,71 +189,19 @@ graphical boot splashes using pango and cairo.
|
|||||||
Summary: Plymouth FreeType label plugin
|
Summary: Plymouth FreeType label plugin
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
Requires: fontconfig
|
Requires: fontconfig
|
||||||
Requires: libply-splash-graphics%{soversion} = %{version}
|
Requires: libply-splash-graphics%{so_version} = %{version}
|
||||||
|
|
||||||
%description plugin-label-ft
|
%description plugin-label-ft
|
||||||
This package contains the label control plugin for
|
This package contains the label control plugin for
|
||||||
Plymouth. It provides the ability to render text on
|
Plymouth. It provides the ability to render text on
|
||||||
graphical boot splashes using FreeTyoe
|
graphical boot splashes using FreeType
|
||||||
|
|
||||||
%package plugin-fade-throbber
|
|
||||||
Summary: Plymouth "Fade-Throbber" plugin
|
|
||||||
Group: System/Base
|
|
||||||
Requires: libply%{soversion} = %{version}
|
|
||||||
Requires: libply-splash-core%{soversion} = %{version}
|
|
||||||
Requires: libply-splash-graphics%{soversion} = %{version}
|
|
||||||
|
|
||||||
%description plugin-fade-throbber
|
|
||||||
This package contains the "Fade-In" boot splash plugin for
|
|
||||||
Plymouth. It features a centered image that fades in and out
|
|
||||||
while other images pulsate around during system boot up.
|
|
||||||
|
|
||||||
%package plugin-throbgress
|
|
||||||
Summary: Plymouth "Throbgress" plugin
|
|
||||||
Group: System/Base
|
|
||||||
Requires: %{name}-plugin-label = %{version}
|
|
||||||
Requires: libply%{soversion} = %{version}
|
|
||||||
Requires: libply-splash-core%{soversion} = %{version}
|
|
||||||
Requires: libply-splash-graphics%{soversion} = %{version}
|
|
||||||
|
|
||||||
%description plugin-throbgress
|
|
||||||
This package contains the "throbgress" boot splash plugin for
|
|
||||||
Plymouth. It features a centered logo and animated spinner that
|
|
||||||
spins repeatedly while a progress bar advances at the bottom of
|
|
||||||
the screen.
|
|
||||||
|
|
||||||
%package plugin-space-flares
|
|
||||||
Summary: Plymouth "space-flares" plugin
|
|
||||||
Group: System/Base
|
|
||||||
Requires: %{name}-plugin-label = %{version}
|
|
||||||
Requires: libply%{soversion} = %{version}
|
|
||||||
Requires: libply-splash-core%{soversion} = %{version}
|
|
||||||
Requires: libply-splash-graphics%{soversion} = %{version}
|
|
||||||
|
|
||||||
%description plugin-space-flares
|
|
||||||
This package contains the "space-flares" boot splash plugin for
|
|
||||||
Plymouth. It features a corner image with animated flares.
|
|
||||||
|
|
||||||
%package plugin-two-step
|
|
||||||
Summary: Plymouth "two-step" plugin
|
|
||||||
Group: System/Base
|
|
||||||
Requires: libply%{soversion} = %{version}
|
|
||||||
Requires: libply-splash-core%{soversion} = %{version}
|
|
||||||
Requires: libply-splash-graphics%{soversion} = %{version}
|
|
||||||
Requires: plymouth-plugin-label = %{version}
|
|
||||||
|
|
||||||
%description plugin-two-step
|
|
||||||
This package contains the "two-step" boot splash plugin for
|
|
||||||
Plymouth. It features a two phased boot process that starts with
|
|
||||||
a progressing animation synced to boot time and finishes with a
|
|
||||||
short, fast one-shot animation.
|
|
||||||
|
|
||||||
%package plugin-script
|
%package plugin-script
|
||||||
Summary: Plymouth "script" plugin
|
Summary: Plymouth "script" plugin
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
Requires: libply%{soversion} = %{version}
|
Requires: libply%{so_version} = %{version}
|
||||||
Requires: libply-splash-core%{soversion} = %{version}
|
Requires: libply-splash-core%{so_version} = %{version}
|
||||||
Requires: libply-splash-graphics%{soversion} = %{version}
|
Requires: libply-splash-graphics%{so_version} = %{version}
|
||||||
|
|
||||||
%description plugin-script
|
%description plugin-script
|
||||||
This package contains the "script" boot splash plugin for
|
This package contains the "script" boot splash plugin for
|
||||||
@ -269,9 +212,9 @@ boot splash themes.
|
|||||||
%package plugin-tribar
|
%package plugin-tribar
|
||||||
Summary: Plymouth "script" plugin
|
Summary: Plymouth "script" plugin
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
Requires: libply%{soversion} = %{version}
|
Requires: libply%{so_version} = %{version}
|
||||||
Requires: libply-splash-core%{soversion} = %{version}
|
Requires: libply-splash-core%{so_version} = %{version}
|
||||||
Requires: libply-splash-graphics%{soversion} = %{version}
|
Requires: libply-splash-graphics%{so_version} = %{version}
|
||||||
|
|
||||||
%description plugin-tribar
|
%description plugin-tribar
|
||||||
This package contains the "tribar" boot splash plugin for
|
This package contains the "tribar" boot splash plugin for
|
||||||
@ -279,23 +222,48 @@ Plymouth. It features an extensible, scriptable boot splash
|
|||||||
language that simplifies the process of designing custom
|
language that simplifies the process of designing custom
|
||||||
boot splash themes.
|
boot splash themes.
|
||||||
|
|
||||||
%package theme-fade-in
|
%package plugin-two-step
|
||||||
Summary: Plymouth "Fade-In" theme
|
Summary: Plymouth "two-step" plugin
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
Requires: %{name}-plugin-fade-throbber = %{version}
|
Requires: libply%{so_version} = %{version}
|
||||||
|
Requires: libply-splash-core%{so_version} = %{version}
|
||||||
|
Requires: libply-splash-graphics%{so_version} = %{version}
|
||||||
Requires: plymouth-plugin-label = %{version}
|
Requires: plymouth-plugin-label = %{version}
|
||||||
|
|
||||||
|
%description plugin-two-step
|
||||||
|
This package contains the "two-step" boot splash plugin for
|
||||||
|
Plymouth. It features a two phased boot process that starts with
|
||||||
|
a progressing animation synced to boot time and finishes with a
|
||||||
|
short, fast one-shot animation.
|
||||||
|
|
||||||
|
%package theme-bgrt
|
||||||
|
Summary: Plymouth "bgrt" theme
|
||||||
|
Group: System/Base
|
||||||
|
Requires: %{name}-plugin-two-step = %{version}
|
||||||
|
Requires: %{name}-theme-spinner = %{version}
|
||||||
Requires(post): %{name}-scripts
|
Requires(post): %{name}-scripts
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description theme-fade-in
|
%description theme-bgrt
|
||||||
This package contains the "Fade-In" boot splash theme for
|
This package contains the "bgrt" boot splash theme for
|
||||||
Plymouth. It features a centered logo that fades in and out
|
Plymouth.
|
||||||
while stars twinkle around the logo during system boot up.
|
|
||||||
|
%package theme-script
|
||||||
|
Summary: Plymouth "Script" theme
|
||||||
|
Group: System/Base
|
||||||
|
Requires: %{name}-plugin-script = %{version}
|
||||||
|
Requires(post): %{name}-scripts
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description theme-script
|
||||||
|
This package contains the "script" boot splash theme for
|
||||||
|
Plymouth. It is a simple example theme the uses the "script"
|
||||||
|
plugin.
|
||||||
|
|
||||||
%package theme-spinfinity
|
%package theme-spinfinity
|
||||||
Summary: Plymouth "Spinfinity" theme
|
Summary: Plymouth "Spinfinity" theme
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
Requires: %{name}-plugin-throbgress = %{version}
|
Requires: %{name}-plugin-two-step = %{version}
|
||||||
Requires(post): %{name}-scripts
|
Requires(post): %{name}-scripts
|
||||||
Requires(pre): %{name}
|
Requires(pre): %{name}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
@ -316,17 +284,6 @@ BuildArch: noarch
|
|||||||
This package contains the "spinner" boot splash theme for
|
This package contains the "spinner" boot splash theme for
|
||||||
Plymouth.
|
Plymouth.
|
||||||
|
|
||||||
%package theme-solar
|
|
||||||
Summary: Plymouth "Solar" theme
|
|
||||||
Group: System/Base
|
|
||||||
Requires: %{name}-plugin-space-flares = %{version}
|
|
||||||
Requires(post): %{name}-scripts
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description theme-solar
|
|
||||||
This package contains the "Solar" boot splash theme for
|
|
||||||
Plymouth. It features a blue flamed sun with animated solar flares.
|
|
||||||
|
|
||||||
%package theme-tribar
|
%package theme-tribar
|
||||||
Summary: Plymouth "Tribar" theme
|
Summary: Plymouth "Tribar" theme
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
@ -338,42 +295,82 @@ BuildArch: noarch
|
|||||||
This package contains the "Tribar" boot splash theme for
|
This package contains the "Tribar" boot splash theme for
|
||||||
Plymouth
|
Plymouth
|
||||||
|
|
||||||
%package theme-script
|
%if %{with x11_renderer}
|
||||||
Summary: Plymouth "Script" theme
|
%package x11-renderer
|
||||||
|
Summary: Plymouth X11 renderer
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
Requires: %{name}-plugin-script = %{version}
|
Requires: %{name} = %{version}
|
||||||
|
|
||||||
|
%description x11-renderer
|
||||||
|
This package provides the X11 renderer which allows to test Plymouth
|
||||||
|
behavior on environments with a valid DISPLAY.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with fedora_theme}
|
||||||
|
%package plugin-fade-throbber
|
||||||
|
Summary: Plymouth "Fade-Throbber" plugin
|
||||||
|
Group: System/Base
|
||||||
|
Requires: libply%{so_version} = %{version}
|
||||||
|
Requires: libply-splash-core%{so_version} = %{version}
|
||||||
|
Requires: libply-splash-graphics%{so_version} = %{version}
|
||||||
|
|
||||||
|
%description plugin-fade-throbber
|
||||||
|
This package contains the "Fade-In" boot splash plugin for
|
||||||
|
Plymouth. It features a centered image that fades in and out
|
||||||
|
while other images pulsate around during system boot up.
|
||||||
|
|
||||||
|
%package theme-fade-in
|
||||||
|
Summary: Plymouth "Fade-In" theme
|
||||||
|
Group: System/Base
|
||||||
|
Requires: %{name}-plugin-fade-throbber = %{version}
|
||||||
|
Requires: plymouth-plugin-label = %{version}
|
||||||
Requires(post): %{name}-scripts
|
Requires(post): %{name}-scripts
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description theme-script
|
%description theme-fade-in
|
||||||
This package contains the "script" boot splash theme for
|
This package contains the "Fade-In" boot splash theme for
|
||||||
Plymouth. It is a simple example theme the uses the "script"
|
Plymouth. It features a centered logo that fades in and out
|
||||||
plugin.
|
while stars twinkle around the logo during system boot up.
|
||||||
|
|
||||||
%package theme-bgrt
|
%package theme-glow
|
||||||
Summary: Plymouth "bgrt" theme
|
Summary: Plymouth "glow" theme
|
||||||
# Uses images from spinner theme
|
|
||||||
Group: System/Base
|
Group: System/Base
|
||||||
Requires: %{name}-plugin-two-step = %{version}
|
Requires: %{name}-plugin-tribar = %{version}
|
||||||
Requires: %{name}-theme-spinner = %{version}
|
|
||||||
Requires(post): %{name}-scripts
|
Requires(post): %{name}-scripts
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description theme-bgrt
|
%description theme-glow
|
||||||
This package contains the "bgrt" boot splash theme for
|
This package contains the "glow" boot splash theme for
|
||||||
Plymouth.
|
Plymouth
|
||||||
|
|
||||||
|
%package plugin-space-flares
|
||||||
|
Summary: Plymouth "space-flares" plugin
|
||||||
|
Group: System/Base
|
||||||
|
Requires: %{name}-plugin-label = %{version}
|
||||||
|
Requires: libply%{so_version} = %{version}
|
||||||
|
Requires: libply-splash-core%{so_version} = %{version}
|
||||||
|
Requires: libply-splash-graphics%{so_version} = %{version}
|
||||||
|
|
||||||
|
%description plugin-space-flares
|
||||||
|
This package contains the "space-flares" boot splash plugin for
|
||||||
|
Plymouth. It features a corner image with animated flares.
|
||||||
|
|
||||||
|
%package theme-solar
|
||||||
|
Summary: Plymouth "Solar" theme
|
||||||
|
Group: System/Base
|
||||||
|
Requires: %{name}-plugin-space-flares = %{version}
|
||||||
|
Requires(post): %{name}-scripts
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description theme-solar
|
||||||
|
This package contains the "Solar" boot splash theme for
|
||||||
|
Plymouth. It features a blue flamed sun with animated solar flares.
|
||||||
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -S git
|
%setup -q
|
||||||
autoreconf -ivf -Wno-portabilty
|
%autopatch -p1
|
||||||
# replace builddate with patch0date
|
autoreconf -ivf
|
||||||
sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c
|
|
||||||
# Change the default theme
|
|
||||||
%if 0%{?is_opensuse}
|
|
||||||
sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults
|
|
||||||
%else
|
|
||||||
sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
@ -381,13 +378,7 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
|
|||||||
--enable-tracing \
|
--enable-tracing \
|
||||||
--disable-silent-rules \
|
--disable-silent-rules \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--disable-gdm-transition \
|
|
||||||
--disable-upstart-monitoring \
|
--disable-upstart-monitoring \
|
||||||
--disable-tests \
|
|
||||||
--disable-libkms \
|
|
||||||
%if %{without x11_renderer}
|
|
||||||
--disable-gtk \
|
|
||||||
%endif
|
|
||||||
--with-release-file=%{_sysconfdir}/os-release \
|
--with-release-file=%{_sysconfdir}/os-release \
|
||||||
--with-boot-tty=/dev/tty7 \
|
--with-boot-tty=/dev/tty7 \
|
||||||
--with-shutdown-tty=/dev/tty1 \
|
--with-shutdown-tty=/dev/tty1 \
|
||||||
@ -395,34 +386,36 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
|
|||||||
--with-background-end-color-stop=0x4EA65C \
|
--with-background-end-color-stop=0x4EA65C \
|
||||||
--with-background-color=0x3391cd \
|
--with-background-color=0x3391cd \
|
||||||
--without-rhgb-compat-link \
|
--without-rhgb-compat-link \
|
||||||
--without-system-root-install
|
--without-logo \
|
||||||
|
--without-system-root-install \
|
||||||
|
%if %{without x11_renderer}
|
||||||
|
--disable-gtk
|
||||||
|
%endif
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%make_install
|
||||||
rm -f %{buildroot}/%{_bindir}/rhgb-client
|
|
||||||
|
|
||||||
#Link the plymouth client binary also to /bin until the move to /usr is completed
|
|
||||||
mkdir %{buildroot}/bin
|
|
||||||
(cd %{buildroot}/bin; ln -s ..%{_bindir}/plymouth)
|
|
||||||
|
|
||||||
# Glow isn't quite ready for primetime
|
|
||||||
rm -rf %{buildroot}%{_datadir}/plymouth/glow/
|
|
||||||
rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/
|
|
||||||
rm -f %{buildroot}%{_libdir}/plymouth/glow.so
|
|
||||||
|
|
||||||
find %{buildroot} -type f -name "*.la" -delete -print
|
|
||||||
|
|
||||||
|
# Create necessary directories:
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/plymouth
|
mkdir -p %{buildroot}%{_localstatedir}/lib/plymouth
|
||||||
mkdir -p %{buildroot}/run/plymouth
|
mkdir -p %{buildroot}/run/plymouth
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/log
|
mkdir -p %{buildroot}%{_localstatedir}/log
|
||||||
touch %{buildroot}%{_localstatedir}/log/boot.log
|
|
||||||
touch %{buildroot}%{_localstatedir}/spool/plymouth/boot.log
|
# Copy upstream's default config file to system and change release settings:
|
||||||
cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_datadir}/plymouth/default-boot-duration
|
|
||||||
cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_localstatedir}/lib/plymouth
|
|
||||||
cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf
|
cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf
|
||||||
|
|
||||||
|
# Link the plymouth client binary to /bin to fit display and emergency service requirement:
|
||||||
|
mkdir %{buildroot}/bin
|
||||||
|
(cd %{buildroot}/bin; ln -s ..%{_bindir}/plymouth)
|
||||||
|
|
||||||
|
# Create boot-duration file for recording boot info:
|
||||||
|
touch %{buildroot}%{_datadir}/plymouth/default-boot-duration
|
||||||
|
touch %{buildroot}%{_localstatedir}/lib/plymouth
|
||||||
|
|
||||||
|
# Remove temp files which produced during the compilation:
|
||||||
|
find $RPM_BUILD_ROOT -name '*.la' -delete
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%{?regenerate_initrd_post}
|
%{?regenerate_initrd_post}
|
||||||
if [ ! -e /.buildenv ]; then
|
if [ ! -e /.buildenv ]; then
|
||||||
@ -441,26 +434,29 @@ fi
|
|||||||
%posttrans
|
%posttrans
|
||||||
%{?regenerate_initrd_posttrans}
|
%{?regenerate_initrd_posttrans}
|
||||||
|
|
||||||
%post -n libply-boot-client%{soversion} -p /sbin/ldconfig
|
%post -n libply-boot-client%{so_version} -p /sbin/ldconfig
|
||||||
%postun -n libply-boot-client%{soversion} -p /sbin/ldconfig
|
%postun -n libply-boot-client%{so_version} -p /sbin/ldconfig
|
||||||
%post -n libply-splash-core%{soversion} -p /sbin/ldconfig
|
%post -n libply-splash-core%{so_version} -p /sbin/ldconfig
|
||||||
%postun -n libply-splash-core%{soversion} -p /sbin/ldconfig
|
%postun -n libply-splash-core%{so_version} -p /sbin/ldconfig
|
||||||
%post -n libply-splash-graphics%{soversion} -p /sbin/ldconfig
|
%post -n libply-splash-graphics%{so_version} -p /sbin/ldconfig
|
||||||
%postun -n libply-splash-graphics%{soversion} -p /sbin/ldconfig
|
%postun -n libply-splash-graphics%{so_version} -p /sbin/ldconfig
|
||||||
%post -n libply%{soversion} -p /sbin/ldconfig
|
%post -n libply%{so_version} -p /sbin/ldconfig
|
||||||
%postun -n libply%{soversion} -p /sbin/ldconfig
|
%postun -n libply%{so_version} -p /sbin/ldconfig
|
||||||
%post theme-spinfinity
|
|
||||||
if [ $1 -eq 1 ]; then
|
%postun theme-bgrt
|
||||||
set -x
|
if [ $1 -eq 0 ]; then
|
||||||
export LIB=%{_libdir}
|
export LIB=%{_libdir}
|
||||||
OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
|
if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "bgrt" ]; then
|
||||||
if [ "$OTHEME" = "text" ]; then
|
%{_sbindir}/plymouth-set-default-theme -R --reset
|
||||||
if [ ! -e /.buildenv ]; then
|
fi
|
||||||
%{_sbindir}/plymouth-set-default-theme -R spinfinity
|
fi
|
||||||
else
|
|
||||||
%{_sbindir}/plymouth-set-default-theme spinfinity
|
%postun theme-script
|
||||||
fi
|
if [ $1 -eq 0 ]; then
|
||||||
fi
|
export LIB=%{_libdir}
|
||||||
|
if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "script" ]; then
|
||||||
|
%{_sbindir}/plymouth-set-default-theme -R --reset
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%postun theme-spinfinity
|
%postun theme-spinfinity
|
||||||
@ -471,20 +467,23 @@ if [ $1 -eq 0 ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%post theme-fade-in
|
%postun theme-spinner
|
||||||
if [ $1 -eq 1 ]; then
|
if [ $1 -eq 0 ]; then
|
||||||
set -x
|
export LIB=%{_libdir}
|
||||||
export LIB=%{_libdir}
|
if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "spinner" ]; then
|
||||||
OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
|
%{_sbindir}/plymouth-set-default-theme -R --reset
|
||||||
if [ "$OTHEME" = "text" ]; then
|
fi
|
||||||
if [ ! -e /.buildenv ]; then
|
|
||||||
%{_sbindir}/plymouth-set-default-theme -R fade-in
|
|
||||||
else
|
|
||||||
%{_sbindir}/plymouth-set-default-theme fade-in
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
%postun theme-tribar
|
||||||
|
if [ $1 -eq 0 ]; then
|
||||||
|
export LIB=%{_libdir}
|
||||||
|
if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "tribar" ]; then
|
||||||
|
%{_sbindir}/plymouth-set-default-theme -R --reset
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
%if %{with fedora_theme}
|
||||||
%postun theme-fade-in
|
%postun theme-fade-in
|
||||||
if [ $1 -eq 0 ]; then
|
if [ $1 -eq 0 ]; then
|
||||||
export LIB=%{_libdir}
|
export LIB=%{_libdir}
|
||||||
@ -493,18 +492,12 @@ if [ $1 -eq 0 ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%post theme-solar
|
%postun theme-glow
|
||||||
if [ $1 -eq 1 ]; then
|
if [ $1 -eq 0 ]; then
|
||||||
set -x
|
export LIB=%{_libdir}
|
||||||
export LIB=%{_libdir}
|
if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "glow" ]; then
|
||||||
OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
|
%{_sbindir}/plymouth-set-default-theme -R --reset
|
||||||
if [ "$OTHEME" = "text" ]; then
|
fi
|
||||||
if [ ! -e /.buildenv ]; then
|
|
||||||
%{_sbindir}/plymouth-set-default-theme -R solar
|
|
||||||
else
|
|
||||||
%{_sbindir}/plymouth-set-default-theme solar
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%postun theme-solar
|
%postun theme-solar
|
||||||
@ -514,10 +507,9 @@ if [ $1 -eq 0 ]; then
|
|||||||
%{_sbindir}/plymouth-set-default-theme -R --reset
|
%{_sbindir}/plymouth-set-default-theme -R --reset
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
%endif
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING
|
|
||||||
%doc AUTHORS NEWS README
|
|
||||||
%dir %{_datadir}/plymouth
|
%dir %{_datadir}/plymouth
|
||||||
%dir %{_datadir}/plymouth/themes
|
%dir %{_datadir}/plymouth/themes
|
||||||
%dir %{_datadir}/plymouth/themes/details
|
%dir %{_datadir}/plymouth/themes/details
|
||||||
@ -526,10 +518,10 @@ fi
|
|||||||
%dir %{_libdir}/plymouth
|
%dir %{_libdir}/plymouth
|
||||||
%dir %{_libdir}/plymouth/renderers
|
%dir %{_libdir}/plymouth/renderers
|
||||||
%dir %{_sysconfdir}/plymouth
|
%dir %{_sysconfdir}/plymouth
|
||||||
%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf
|
|
||||||
%{plymouthdaemon_execdir}/plymouthd
|
|
||||||
%{plymouthclient_execdir}/plymouth
|
|
||||||
/bin/plymouth
|
/bin/plymouth
|
||||||
|
%{_bindir}/plymouth
|
||||||
|
%{_sbindir}/plymouthd
|
||||||
|
%config(noreplace) %{_sysconfdir}/logrotate.d/bootlog
|
||||||
%{_libdir}/plymouth/details.so
|
%{_libdir}/plymouth/details.so
|
||||||
%{_libdir}/plymouth/text.so
|
%{_libdir}/plymouth/text.so
|
||||||
%{_libdir}/plymouth/renderers/drm*
|
%{_libdir}/plymouth/renderers/drm*
|
||||||
@ -538,22 +530,26 @@ fi
|
|||||||
%{_datadir}/plymouth/themes/details/details.plymouth
|
%{_datadir}/plymouth/themes/details/details.plymouth
|
||||||
%{_datadir}/plymouth/themes/text/text.plymouth
|
%{_datadir}/plymouth/themes/text/text.plymouth
|
||||||
%{_datadir}/plymouth/plymouthd.defaults
|
%{_datadir}/plymouth/plymouthd.defaults
|
||||||
%{_datadir}/plymouth/bizcom.png
|
|
||||||
%ghost /run/plymouth
|
|
||||||
%{_localstatedir}/spool/plymouth
|
%{_localstatedir}/spool/plymouth
|
||||||
%{_mandir}/man?/*
|
|
||||||
%ghost %{_localstatedir}/lib/plymouth/boot-duration
|
|
||||||
%{_unitdir}/*
|
%{_unitdir}/*
|
||||||
|
%ghost /run/plymouth
|
||||||
|
%ghost %{_localstatedir}/lib/plymouth/boot-duration
|
||||||
%ghost %{_localstatedir}/log/boot.log
|
%ghost %{_localstatedir}/log/boot.log
|
||||||
|
%{_mandir}/man?/*
|
||||||
|
%doc AUTHORS NEWS README
|
||||||
|
%license COPYING
|
||||||
/usr/share/locale/
|
/usr/share/locale/
|
||||||
|
|
||||||
|
%files branding-upstream
|
||||||
|
%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf
|
||||||
|
|
||||||
%files dracut
|
%files dracut
|
||||||
%{_libexecdir}/plymouth/plymouth-populate-initrd
|
%{_libexecdir}/plymouth/plymouth-populate-initrd
|
||||||
%{_libexecdir}/plymouth/plymouth-generate-initrd
|
%{_libexecdir}/plymouth/plymouth-generate-initrd
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{plymouth_libdir}/libply.so
|
%{_libdir}/libply.so
|
||||||
%{plymouth_libdir}/libply-splash-core.so
|
%{_libdir}/libply-splash-core.so
|
||||||
%{_libdir}/libply-boot-client.so
|
%{_libdir}/libply-boot-client.so
|
||||||
%{_libdir}/libply-splash-graphics.so
|
%{_libdir}/libply-splash-graphics.so
|
||||||
%{_libdir}/pkgconfig/ply-splash-core.pc
|
%{_libdir}/pkgconfig/ply-splash-core.pc
|
||||||
@ -561,90 +557,81 @@ fi
|
|||||||
%{_libdir}/pkgconfig/ply-boot-client.pc
|
%{_libdir}/pkgconfig/ply-boot-client.pc
|
||||||
%{_includedir}/plymouth-1
|
%{_includedir}/plymouth-1
|
||||||
|
|
||||||
%files -n libply-boot-client%{soversion}
|
%files -n libply-boot-client%{so_version}
|
||||||
%{_libdir}/libply-boot-client.so.%{soversion}*
|
%{_libdir}/libply-boot-client.so.%{so_version}*
|
||||||
|
|
||||||
%files -n libply-splash-core%{soversion}
|
%files -n libply-splash-core%{so_version}
|
||||||
%{plymouth_libdir}/libply-splash-core.so.%{soversion}*
|
%{_libdir}/libply-splash-core.so.%{so_version}*
|
||||||
|
|
||||||
%files -n libply-splash-graphics%{soversion}
|
%files -n libply-splash-graphics%{so_version}
|
||||||
%{_libdir}/libply-splash-graphics.so.%{soversion}*
|
%{_libdir}/libply-splash-graphics.so.%{so_version}*
|
||||||
|
|
||||||
%files -n libply%{soversion}
|
%files -n libply%{so_version}
|
||||||
%{plymouth_libdir}/libply.so.%{soversion}*
|
%{_libdir}/libply.so.%{so_version}*
|
||||||
|
|
||||||
%files scripts
|
%files scripts
|
||||||
%dir %{_libexecdir}/plymouth
|
%dir %{_libexecdir}/plymouth
|
||||||
%{_sbindir}/plymouth-set-default-theme
|
%{_sbindir}/plymouth-set-default-theme
|
||||||
%{_libexecdir}/plymouth/plymouth-update-initrd
|
%{_libexecdir}/plymouth/plymouth-update-initrd
|
||||||
|
|
||||||
%if %{with x11_renderer}
|
|
||||||
%files x11-renderer
|
|
||||||
%{_libdir}/plymouth/renderers/x11*
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files plugin-label
|
%files plugin-label
|
||||||
%{_libdir}/plymouth/label.so
|
%{_libdir}/plymouth/label.so
|
||||||
|
|
||||||
%files plugin-label-ft
|
%files plugin-label-ft
|
||||||
%{_libdir}/plymouth/label-ft.so
|
%{_libdir}/plymouth/label-ft.so
|
||||||
|
|
||||||
|
%files plugin-script
|
||||||
|
%{_libdir}/plymouth/script.so
|
||||||
|
|
||||||
|
%files plugin-tribar
|
||||||
|
%{_libdir}/plymouth/tribar.so
|
||||||
|
|
||||||
|
%files plugin-two-step
|
||||||
|
%{_libdir}/plymouth/two-step.so
|
||||||
|
|
||||||
|
%files theme-bgrt
|
||||||
|
%dir %{_datadir}/plymouth/themes/bgrt
|
||||||
|
%{_datadir}/plymouth/themes/bgrt/*
|
||||||
|
|
||||||
|
%files theme-script
|
||||||
|
%dir %{_datadir}/plymouth/themes/script/
|
||||||
|
%{_datadir}/plymouth/themes/script/*
|
||||||
|
|
||||||
|
%files theme-spinfinity
|
||||||
|
%dir %{_datadir}/plymouth/themes/spinfinity
|
||||||
|
%{_datadir}/plymouth/themes/spinfinity/*
|
||||||
|
|
||||||
|
%files theme-spinner
|
||||||
|
%dir %{_datadir}/plymouth/themes/spinner
|
||||||
|
%{_datadir}/plymouth/themes/spinner/*
|
||||||
|
|
||||||
|
%files theme-tribar
|
||||||
|
%dir %{_datadir}/plymouth/themes/tribar
|
||||||
|
%{_datadir}/plymouth/themes/tribar/*
|
||||||
|
|
||||||
|
%if %{with x11_renderer}
|
||||||
|
%files x11-renderer
|
||||||
|
%{_libdir}/plymouth/renderers/x11*
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with fedora_theme}
|
||||||
%files plugin-fade-throbber
|
%files plugin-fade-throbber
|
||||||
%{_libdir}/plymouth/fade-throbber.so
|
%{_libdir}/plymouth/fade-throbber.so
|
||||||
|
|
||||||
%files theme-fade-in
|
%files theme-fade-in
|
||||||
%dir %{_datadir}/plymouth/themes/fade-in
|
%dir %{_datadir}/plymouth/themes/fade-in
|
||||||
%{_datadir}/plymouth/themes/fade-in/bullet.png
|
%{_datadir}/plymouth/themes/fade-in/*
|
||||||
%{_datadir}/plymouth/themes/fade-in/entry.png
|
|
||||||
%{_datadir}/plymouth/themes/fade-in/lock.png
|
|
||||||
%{_datadir}/plymouth/themes/fade-in/star.png
|
|
||||||
%{_datadir}/plymouth/themes/fade-in/fade-in.plymouth
|
|
||||||
|
|
||||||
%files plugin-throbgress
|
%files theme-glow
|
||||||
%{_libdir}/plymouth/throbgress.so
|
%dir %{_datadir}/plymouth/themes/glow
|
||||||
|
%{_datadir}/plymouth/themes/glow/*
|
||||||
%files theme-spinfinity
|
|
||||||
%dir %{_datadir}/plymouth/themes/spinfinity
|
|
||||||
%{_datadir}/plymouth/themes/spinfinity/box.png
|
|
||||||
%{_datadir}/plymouth/themes/spinfinity/bullet.png
|
|
||||||
%{_datadir}/plymouth/themes/spinfinity/entry.png
|
|
||||||
%{_datadir}/plymouth/themes/spinfinity/lock.png
|
|
||||||
%{_datadir}/plymouth/themes/spinfinity/throbber-[0-3][0-9].png
|
|
||||||
%{_datadir}/plymouth/themes/spinfinity/spinfinity.plymouth
|
|
||||||
|
|
||||||
%files plugin-space-flares
|
%files plugin-space-flares
|
||||||
%{_libdir}/plymouth/space-flares.so
|
%{_libdir}/plymouth/space-flares.so
|
||||||
|
|
||||||
%files theme-spinner
|
|
||||||
%dir %{_datadir}/plymouth/themes/spinner
|
|
||||||
%{_datadir}/plymouth/themes/spinner/*.*
|
|
||||||
|
|
||||||
%files theme-solar
|
%files theme-solar
|
||||||
%dir %{_datadir}/plymouth/themes/solar
|
%dir %{_datadir}/plymouth/themes/solar
|
||||||
%{_datadir}/plymouth/themes/solar/*.png
|
%{_datadir}/plymouth/themes/solar/*
|
||||||
%{_datadir}/plymouth/themes/solar/solar.plymouth
|
%endif
|
||||||
|
|
||||||
%files theme-tribar
|
|
||||||
%dir %{_datadir}/plymouth/themes/tribar
|
|
||||||
%{_datadir}/plymouth/themes/tribar/*.*
|
|
||||||
|
|
||||||
%files plugin-two-step
|
|
||||||
%{_libdir}/plymouth/two-step.so
|
|
||||||
|
|
||||||
%files plugin-tribar
|
|
||||||
%{_libdir}/plymouth/tribar.so
|
|
||||||
|
|
||||||
%files plugin-script
|
|
||||||
%{_libdir}/plymouth/script.so
|
|
||||||
|
|
||||||
%files theme-script
|
|
||||||
%dir %{_datadir}/plymouth/themes/script/
|
|
||||||
%{_datadir}/plymouth/themes/script/*.png
|
|
||||||
%{_datadir}/plymouth/themes/script/script.script
|
|
||||||
%{_datadir}/plymouth/themes/script/script.plymouth
|
|
||||||
|
|
||||||
%files theme-bgrt
|
|
||||||
%dir %{_datadir}/plymouth/themes/bgrt
|
|
||||||
%{_datadir}/plymouth/themes/bgrt/*.*
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user