From 47124e0337d1524b53d6c6b05975e4c5a1b4012ebbd86fbff709f1edbb7a4a24 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Tue, 24 Dec 2019 09:11:25 +0000 Subject: [PATCH 01/10] Accepting request 759105 from home:qzhao:branches:Base:System Update to version plymouth-0.9.5+git20191101+d18086e. OBS-URL: https://build.opensuse.org/request/show/759105 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=244 --- 0001-Add-label-ft-plugin.patch | 90 +++------ ...l-ft-plugin-into-initrd-if-available.patch | 12 +- plymouth-0.9.5+git20190908+3abfab2.tar.xz | 3 - plymouth-0.9.5+git20191101+d18086e.tar.xz | 3 + plymouth-correct-runtime-dir.patch | 13 -- plymouth-dracut-path.patch | 15 -- plymouth.changes | 23 +++ plymouth.spec | 191 +++++++----------- 8 files changed, 135 insertions(+), 215 deletions(-) delete mode 100644 plymouth-0.9.5+git20190908+3abfab2.tar.xz create mode 100644 plymouth-0.9.5+git20191101+d18086e.tar.xz delete mode 100644 plymouth-correct-runtime-dir.patch delete mode 100644 plymouth-dracut-path.patch diff --git a/0001-Add-label-ft-plugin.patch b/0001-Add-label-ft-plugin.patch index 3a403d5..78f8863 100644 --- a/0001-Add-label-ft-plugin.patch +++ b/0001-Add-label-ft-plugin.patch @@ -1,30 +1,7 @@ -From 04fd53750abc1f792ab6d5bdf7416bd7c42451b2 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Mon, 25 Jan 2016 08:58:03 +0100 -Subject: [PATCH 1/2] Add label-ft plugin - -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 ---- - 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 +diff -Nura plymouth-0.9.5+git20191101+d18086e/configure.ac plymouth-0.9.5+git20191101+d18086e_new/configure.ac +--- plymouth-0.9.5+git20191101+d18086e/configure.ac 2019-11-06 10:19:50.000000000 +0800 ++++ plymouth-0.9.5+git20191101+d18086e_new/configure.ac 2019-12-14 17:27:03.730000000 +0800 +@@ -76,6 +76,15 @@ AC_SUBST(PANGO_LIBS) fi @@ -40,50 +17,31 @@ 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) 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/controls/Makefile src/plugins/controls/label/Makefile -+ src/plugins/controls/label-ft/Makefile ++ src/plugins/controls/label-ft/Makefile src/Makefile src/client/ply-boot-client.pc src/client/Makefile -Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c -=================================================================== ---- 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.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c 2018-08-17 19:58:59.703026810 +0200 -@@ -96,8 +96,13 @@ ply_label_load_plugin (ply_label_t *labe +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.5+git20191101+d18086e_new/src/libply-splash-graphics/ply-label.c 2019-12-14 17:23:10.796000000 +0800 +@@ -98,6 +98,10 @@ - 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"); + /* ...and the FreeType based one after that, it is not a complete substitute (yet). */ + if (label->module_handle == NULL) + label->module_handle = ply_open_module (PLYMOUTH_PLUGIN_PATH "label-ft.so"); -+ ++ if (label->module_handle == NULL) return false; -Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/Makefile.am -=================================================================== ---- plymouth-0.9.3+git20180807.7663b0c.orig/src/plugins/controls/Makefile.am 2018-08-07 17:41:15.000000000 +0200 -+++ 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 +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.5+git20191101+d18086e_new/src/plugins/controls/label-ft/Makefile.am 2019-12-14 17:17:26.473000000 +0800 @@ -0,0 +1,22 @@ +AM_CPPFLAGS = -I$(top_srcdir) \ + -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 + +MAINTAINERCLEANFILES = Makefile.in -Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c 2018-08-17 19:58:59.703026810 +0200 +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 ++++ plymouth-0.9.5+git20191101+d18086e_new/src/plugins/controls/label-ft/plugin.c 2019-12-14 17:17:26.475000000 +0800 @@ -0,0 +1,507 @@ +/* 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: */ +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 diff --git a/0002-Install-label-ft-plugin-into-initrd-if-available.patch b/0002-Install-label-ft-plugin-into-initrd-if-available.patch index 4b4b3d3..575b78e 100644 --- a/0002-Install-label-ft-plugin-into-initrd-if-available.patch +++ b/0002-Install-label-ft-plugin-into-initrd-if-available.patch @@ -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 ---- plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.in 2019-03-12 20:11:18.845236943 +0800 -+++ plymouth-0.9.4+git20190304.ed9f201_new/scripts/plymouth-populate-initrd.in 2019-03-12 20:25:34.933746928 +0800 -@@ -433,6 +433,15 @@ +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.5+git20191101+d18086e/scripts/plymouth-populate-initrd.in 2019-11-06 10:19:50.000000000 +0800 ++++ plymouth-0.9.5+git20191101+d18086e_new/scripts/plymouth-populate-initrd.in 2019-12-14 18:28:06.448000000 +0800 +@@ -461,6 +461,15 @@ inst_recur "${PLYMOUTH_IMAGE_DIR}" 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 +fi + - if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then - cp -a ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes + if [ -L ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then + cp -a ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes fi diff --git a/plymouth-0.9.5+git20190908+3abfab2.tar.xz b/plymouth-0.9.5+git20190908+3abfab2.tar.xz deleted file mode 100644 index 3350a4e..0000000 --- a/plymouth-0.9.5+git20190908+3abfab2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15e017611ca3181c4d5b50510628b62c9c97009cf10f3a38fb6ba960429cfd09 -size 5774076 diff --git a/plymouth-0.9.5+git20191101+d18086e.tar.xz b/plymouth-0.9.5+git20191101+d18086e.tar.xz new file mode 100644 index 0000000..6ef3225 --- /dev/null +++ b/plymouth-0.9.5+git20191101+d18086e.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1485a5e4b7e79b4974fd67b977333ca817fc33ab60b27853e5b4769ea6bf2b3b +size 6063712 diff --git a/plymouth-correct-runtime-dir.patch b/plymouth-correct-runtime-dir.patch deleted file mode 100644 index 2292f28..0000000 --- a/plymouth-correct-runtime-dir.patch +++ /dev/null @@ -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) diff --git a/plymouth-dracut-path.patch b/plymouth-dracut-path.patch deleted file mode 100644 index 9b95e4b..0000000 --- a/plymouth-dracut-path.patch +++ /dev/null @@ -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 diff --git a/plymouth.changes b/plymouth.changes index 02fcc65..c638e68 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Tue Dec 24 08:49:24 UTC 2019 - Cliff Zhao + +- Update to version plymouth-0.9.5+git20191101+d18086e: + * 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. +- 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 diff --git a/plymouth.spec b/plymouth.spec index 6aa7957..937c920 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -1,7 +1,7 @@ # # spec file for package plymouth # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,54 +20,43 @@ # it is not used in the production environment. %bcond_with x11_renderer -%global soversion 5 -%define plymouthdaemon_execdir %{_sbindir} -%define plymouthclient_execdir %{_bindir} -%define plymouth_libdir %{_libdir} -%define plymouth_initrd_file /boot/initrd-plymouth.img +%global so_version 5 +%global git_version git20191101+d18086e Name: plymouth -Version: 0.9.5+git20190908+3abfab2 +Version: 0.9.%{so_version}+%{git_version} Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later Group: System/Base -Url: http://www.freedesktop.org/wiki/Software/Plymouth - +URL: http://www.freedesktop.org/wiki/Software/Plymouth 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. -Patch1: 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 -Patch2: plymouth-correct-runtime-dir.patch +Patch0: plymouth-some-greenish-openSUSE-colors.patch # PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation -Patch3: plymouth-manpages.patch +Patch1: plymouth-manpages.patch # PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch. -Patch4: plymouth-only_use_fb_for_cirrus_bochs.patch +Patch2: plymouth-only_use_fb_for_cirrus_bochs.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. -Patch5: plymouth-avoid-umount-hanging-shutdown.patch - +Patch3: plymouth-avoid-umount-hanging-shutdown.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. 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. 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. Patch1002: 0003-fix_null_deref.patch - BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc BuildRequires: git +BuildRequires: intltool BuildRequires: kernel-headers BuildRequires: libtool BuildRequires: libxslt BuildRequires: module-init-tools BuildRequires: pkgconfig BuildRequires: suse-module-tools -# needed for systemd-tty-ask-password-agent -BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(cairo) @@ -80,7 +69,6 @@ BuildRequires: pkgconfig(systemd) >= 186 %if %{with x11_renderer} BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 %endif - Recommends: %{name}-lang Requires: %{name}-branding Requires: gnu-unifont-bitmap-fonts @@ -101,36 +89,36 @@ place of the text messages that normally get shown. Text messages are instead redirected to a log file for viewing after boot. -%package -n libply-boot-client%{soversion} +%package -n libply-boot-client%{so_version} Summary: Plymouth core library 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. -%package -n libply-splash-core%{soversion} +%package -n libply-splash-core%{so_version} Summary: Plymouth core library 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 used by graphical Plymouth splashes. -%package -n libply-splash-graphics%{soversion} +%package -n libply-splash-graphics%{so_version} Summary: Plymouth graphics libraries Group: Development/Libraries/C and C++ BuildRequires: libpng-devel -%description -n libply-splash-graphics%{soversion} +%description -n libply-splash-graphics%{so_version} This package contains the libply-splash-graphics library used by graphical Plymouth splashes. -%package -n libply%{soversion} +%package -n libply%{so_version} Summary: Plymouth core library 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. %package devel @@ -140,10 +128,10 @@ Requires: %{name} = %{version} %if %{with x11_renderer} Requires: %{name}-x11-renderer = %{version} %endif -Requires: libply-boot-client%{soversion} = %{version} -Requires: libply-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} -Requires: libply%{soversion} = %{version} +Requires: libply%{so_version} = %{version} +Requires: libply-boot-client%{so_version} = %{version} +Requires: libply-splash-core%{so_version} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} Requires: pkgconfig %description devel @@ -185,7 +173,7 @@ the system. %package plugin-label Summary: Plymouth label plugin Group: System/Base -Requires: libply-splash-graphics%{soversion} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} %description plugin-label This package contains the label control plugin for @@ -196,7 +184,7 @@ graphical boot splashes using pango and cairo. Summary: Plymouth FreeType label plugin Group: System/Base Requires: fontconfig -Requires: libply-splash-graphics%{soversion} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} %description plugin-label-ft This package contains the label control plugin for @@ -206,36 +194,22 @@ graphical boot splashes using FreeTyoe %package plugin-fade-throbber Summary: Plymouth "Fade-Throbber" plugin Group: System/Base -Requires: libply-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} -Requires: libply%{soversion} = %{version} +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 plugin-throbgress -Summary: Plymouth "Throbgress" plugin -Group: System/Base -Requires: %{name}-plugin-label = %{version} -Requires: libply-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} -Requires: libply%{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-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} -Requires: libply%{soversion} = %{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 @@ -244,9 +218,9 @@ Plymouth. It features a corner image with animated flares. %package plugin-two-step Summary: Plymouth "two-step" plugin Group: System/Base -Requires: libply-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} -Requires: libply%{soversion} = %{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} %description plugin-two-step @@ -258,9 +232,9 @@ short, fast one-shot animation. %package plugin-script Summary: Plymouth "script" plugin Group: System/Base -Requires: libply-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} -Requires: libply%{soversion} = %{version} +Requires: libply%{so_version} = %{version} +Requires: libply-splash-core%{so_version} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} %description plugin-script This package contains the "script" boot splash plugin for @@ -271,9 +245,9 @@ boot splash themes. %package plugin-tribar Summary: Plymouth "script" plugin Group: System/Base -Requires: libply-splash-core%{soversion} = %{version} -Requires: libply-splash-graphics%{soversion} = %{version} -Requires: libply%{soversion} = %{version} +Requires: libply%{so_version} = %{version} +Requires: libply-splash-core%{so_version} = %{version} +Requires: libply-splash-graphics%{so_version} = %{version} %description plugin-tribar This package contains the "tribar" boot splash plugin for @@ -383,13 +357,9 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults --enable-tracing \ --disable-silent-rules \ --disable-static \ - --disable-gdm-transition \ --disable-upstart-monitoring \ --disable-tests \ --disable-libkms \ -%if %{without x11_renderer} - --disable-gtk \ -%endif --with-release-file=%{_sysconfdir}/os-release \ --with-boot-tty=/dev/tty7 \ --with-shutdown-tty=/dev/tty1 \ @@ -397,7 +367,10 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults --with-background-end-color-stop=0x4EA65C \ --with-background-color=0x3391cd \ --without-rhgb-compat-link \ - --without-system-root-install + --without-system-root-install \ +%if %{without x11_renderer} + --disable-gtk +%endif make %{?_smp_mflags} @@ -405,14 +378,11 @@ make %{?_smp_mflags} %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 +rm -rf %{buildroot}%{_datadir}/plymouth/themes/spinfinity/header-image.png find %{buildroot} -type f -name "*.la" -delete -print @@ -443,14 +413,14 @@ fi %posttrans %{?regenerate_initrd_posttrans} -%post -n libply-boot-client%{soversion} -p /sbin/ldconfig -%postun -n libply-boot-client%{soversion} -p /sbin/ldconfig -%post -n libply-splash-core%{soversion} -p /sbin/ldconfig -%postun -n libply-splash-core%{soversion} -p /sbin/ldconfig -%post -n libply-splash-graphics%{soversion} -p /sbin/ldconfig -%postun -n libply-splash-graphics%{soversion} -p /sbin/ldconfig -%post -n libply%{soversion} -p /sbin/ldconfig -%postun -n libply%{soversion} -p /sbin/ldconfig +%post -n libply-boot-client%{so_version} -p /sbin/ldconfig +%postun -n libply-boot-client%{so_version} -p /sbin/ldconfig +%post -n libply-splash-core%{so_version} -p /sbin/ldconfig +%postun -n libply-splash-core%{so_version} -p /sbin/ldconfig +%post -n libply-splash-graphics%{so_version} -p /sbin/ldconfig +%postun -n libply-splash-graphics%{so_version} -p /sbin/ldconfig +%post -n libply%{so_version} -p /sbin/ldconfig +%postun -n libply%{so_version} -p /sbin/ldconfig %post theme-spinfinity if [ $1 -eq 1 ]; then set -x @@ -529,9 +499,9 @@ fi %dir %{_libdir}/plymouth/renderers %dir %{_sysconfdir}/plymouth %config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf -%{plymouthdaemon_execdir}/plymouthd -%{plymouthclient_execdir}/plymouth -/bin/plymouth +%config(noreplace) %{_sysconfdir}/logrotate.d/bootlog +%{_sbindir}/plymouthd +%{_bindir}/plymouth %{_libdir}/plymouth/details.so %{_libdir}/plymouth/text.so %{_libdir}/plymouth/renderers/drm* @@ -554,8 +524,8 @@ fi %{_libexecdir}/plymouth/plymouth-generate-initrd %files devel -%{plymouth_libdir}/libply.so -%{plymouth_libdir}/libply-splash-core.so +%{_libdir}/libply.so +%{_libdir}/libply-splash-core.so %{_libdir}/libply-boot-client.so %{_libdir}/libply-splash-graphics.so %{_libdir}/pkgconfig/ply-splash-core.pc @@ -563,17 +533,17 @@ fi %{_libdir}/pkgconfig/ply-boot-client.pc %{_includedir}/plymouth-1 -%files -n libply-boot-client%{soversion} -%{_libdir}/libply-boot-client.so.%{soversion}* +%files -n libply-boot-client%{so_version} +%{_libdir}/libply-boot-client.so.%{so_version}* -%files -n libply-splash-core%{soversion} -%{plymouth_libdir}/libply-splash-core.so.%{soversion}* +%files -n libply-splash-core%{so_version} +%{_libdir}/libply-splash-core.so.%{so_version}* -%files -n libply-splash-graphics%{soversion} -%{_libdir}/libply-splash-graphics.so.%{soversion}* +%files -n libply-splash-graphics%{so_version} +%{_libdir}/libply-splash-graphics.so.%{so_version}* -%files -n libply%{soversion} -%{plymouth_libdir}/libply.so.%{soversion}* +%files -n libply%{so_version} +%{_libdir}/libply.so.%{so_version}* %files scripts %dir %{_libexecdir}/plymouth @@ -596,39 +566,26 @@ fi %files theme-fade-in %dir %{_datadir}/plymouth/themes/fade-in -%{_datadir}/plymouth/themes/fade-in/bullet.png -%{_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 -%{_libdir}/plymouth/throbgress.so +%{_datadir}/plymouth/themes/fade-in/* %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 +%{_datadir}/plymouth/themes/spinfinity/* %files plugin-space-flares %{_libdir}/plymouth/space-flares.so %files theme-spinner %dir %{_datadir}/plymouth/themes/spinner -%{_datadir}/plymouth/themes/spinner/*.* +%{_datadir}/plymouth/themes/spinner/* %files theme-solar %dir %{_datadir}/plymouth/themes/solar -%{_datadir}/plymouth/themes/solar/*.png -%{_datadir}/plymouth/themes/solar/solar.plymouth +%{_datadir}/plymouth/themes/solar/* %files theme-tribar %dir %{_datadir}/plymouth/themes/tribar -%{_datadir}/plymouth/themes/tribar/*.* +%{_datadir}/plymouth/themes/tribar/* %files plugin-two-step %{_libdir}/plymouth/two-step.so @@ -641,12 +598,10 @@ fi %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 +%{_datadir}/plymouth/themes/script/* %files theme-bgrt %dir %{_datadir}/plymouth/themes/bgrt -%{_datadir}/plymouth/themes/bgrt/*.* +%{_datadir}/plymouth/themes/bgrt/* %changelog From e63e79a27303884cd9289cb57c656e32e07aaf9c0e7061517f0693cd322b09f1 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Wed, 25 Dec 2019 01:10:54 +0000 Subject: [PATCH 02/10] Accepting request 759145 from home:qzhao:branches:Base:System Update to version plymouth-0.9.5+git20191101+d18086e OBS-URL: https://build.opensuse.org/request/show/759145 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=245 --- plymouth.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plymouth.spec b/plymouth.spec index 937c920..0eead32 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -24,7 +24,7 @@ %global git_version git20191101+d18086e Name: plymouth -Version: 0.9.%{so_version}+%{git_version} +Version: 0.9.5+%{git_version} Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later From 8abc451acb91b812cc0cf30e2e10584e7fbfd3707a6bdb6f4849b267a2134013 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Fri, 3 Jan 2020 01:52:31 +0000 Subject: [PATCH 03/10] Accepting request 760519 from home:qzhao:branches:Base:System Update to version plymouth-0.9.5+git20191101+d18086e OBS-URL: https://build.opensuse.org/request/show/760519 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=246 --- plymouth-0.9.5+git20191101+d18086e.tar.xz | 3 --- plymouth-0.9.5+git20191224+d7c737d.tar.xz | 3 +++ plymouth.changes | 5 ++--- plymouth.spec | 14 ++++++++------ 4 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 plymouth-0.9.5+git20191101+d18086e.tar.xz create mode 100644 plymouth-0.9.5+git20191224+d7c737d.tar.xz diff --git a/plymouth-0.9.5+git20191101+d18086e.tar.xz b/plymouth-0.9.5+git20191101+d18086e.tar.xz deleted file mode 100644 index 6ef3225..0000000 --- a/plymouth-0.9.5+git20191101+d18086e.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1485a5e4b7e79b4974fd67b977333ca817fc33ab60b27853e5b4769ea6bf2b3b -size 6063712 diff --git a/plymouth-0.9.5+git20191224+d7c737d.tar.xz b/plymouth-0.9.5+git20191224+d7c737d.tar.xz new file mode 100644 index 0000000..d260c26 --- /dev/null +++ b/plymouth-0.9.5+git20191224+d7c737d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e608b5e72dd721167d1ea348ee3fd06ca69479c19f5c1c589f05c280720b57e +size 6006168 diff --git a/plymouth.changes b/plymouth.changes index c638e68..114b074 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Dec 24 08:49:24 UTC 2019 - Cliff Zhao -- Update to version plymouth-0.9.5+git20191101+d18086e: +- 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 @@ -32,8 +32,7 @@ Wed Sep 11 07:54:48 UTC 2019 - Cliff Zhao - Add patch plymouth-avoid-umount-hanging-shutdown.patch: To avoid grantpt() call nsslookup, it will hanging system unmount - /var during shutdown period(bsc#1105688, bsc#1129386, - bsc#1134660). + /var during shutdown period(bsc#1105688,bsc#1129386,bsc#1134660). ------------------------------------------------------------------- Thu Aug 15 03:56:10 UTC 2019 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index 0eead32..0b5c0d9 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -1,7 +1,7 @@ # # spec file for package plymouth # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %bcond_with x11_renderer %global so_version 5 -%global git_version git20191101+d18086e +%global git_version git20191224+d7c737d Name: plymouth Version: 0.9.5+%{git_version} @@ -368,6 +368,8 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults --with-background-color=0x3391cd \ --without-rhgb-compat-link \ --without-system-root-install \ + --bindir=/bin \ + --sbindir=/sbin \ %if %{without x11_renderer} --disable-gtk %endif @@ -381,7 +383,7 @@ rm -f %{buildroot}/%{_bindir}/rhgb-client # 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 +rm -rf %{buildroot}%{_libdir}/plymouth/glow.so rm -rf %{buildroot}%{_datadir}/plymouth/themes/spinfinity/header-image.png find %{buildroot} -type f -name "*.la" -delete -print @@ -500,8 +502,8 @@ fi %dir %{_sysconfdir}/plymouth %config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/bootlog -%{_sbindir}/plymouthd -%{_bindir}/plymouth +/sbin/plymouthd +/bin/plymouth %{_libdir}/plymouth/details.so %{_libdir}/plymouth/text.so %{_libdir}/plymouth/renderers/drm* @@ -547,7 +549,7 @@ fi %files scripts %dir %{_libexecdir}/plymouth -%{_sbindir}/plymouth-set-default-theme +/sbin/plymouth-set-default-theme %{_libexecdir}/plymouth/plymouth-update-initrd %if %{with x11_renderer} From c7b5f225b9cab40a75a9c20888504d7eb980d9a02e18a06d29f77aab7f4734b6 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Mon, 6 Jan 2020 08:48:36 +0000 Subject: [PATCH 04/10] Accepting request 760866 from home:StefanBruens:branches:Base:System - Fix spinfinity Requires, throbgress is no longer available, but the two-step plugin has gained the required capabilities. OBS-URL: https://build.opensuse.org/request/show/760866 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=247 --- plymouth.changes | 6 ++++++ plymouth.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plymouth.changes b/plymouth.changes index 114b074..46dfff6 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 5 04:01:42 UTC 2020 - Stefan Brüns + +- 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 diff --git a/plymouth.spec b/plymouth.spec index 0b5c0d9..b6e9d02 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -271,7 +271,7 @@ while stars twinkle around the logo during system boot up. %package theme-spinfinity Summary: Plymouth "Spinfinity" theme Group: System/Base -Requires: %{name}-plugin-throbgress = %{version} +Requires: %{name}-plugin-two-step = %{version} Requires(post): %{name}-scripts Requires(pre): %{name} BuildArch: noarch From c9acf30c77a9dc09d0613ed801438c1cad54533ee585e169a9ccae770b16e6da Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Tue, 18 Feb 2020 17:31:57 +0000 Subject: [PATCH 05/10] Accepting request 774903 from home:StefanBruens:branches:Base:System - 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. OBS-URL: https://build.opensuse.org/request/show/774903 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=248 --- plymouth.changes | 11 +++++++++++ plymouth.spec | 26 +++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 46dfff6..724b2f9 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Feb 13 19:25:54 UTC 2020 - Stefan Brüns + +- 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 diff --git a/plymouth.spec b/plymouth.spec index b6e9d02..cbcb877 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -29,7 +29,7 @@ Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later Group: System/Base -URL: http://www.freedesktop.org/wiki/Software/Plymouth +URL: https://www.freedesktop.org/wiki/Software/Plymouth Source0: %{name}-%{version}.tar.xz Source1: boot-duration # PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com -- To use suse colors in tribar. @@ -49,14 +49,16 @@ Patch1002: 0003-fix_null_deref.patch BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc -BuildRequires: git BuildRequires: intltool -BuildRequires: kernel-headers BuildRequires: libtool BuildRequires: libxslt -BuildRequires: module-init-tools BuildRequires: pkgconfig +%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 BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(cairo) @@ -71,7 +73,6 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 %endif Recommends: %{name}-lang Requires: %{name}-branding -Requires: gnu-unifont-bitmap-fonts Requires: systemd >= 186 Requires(post): coreutils Requires(post): plymouth-scripts = %{version} @@ -159,12 +160,12 @@ behavior on environments with a valid DISPLAY. %package scripts Summary: Plymouth related scripts Group: System/Base -Requires: coreutils -Requires: cpio +Requires: awk Requires: dracut -Requires: findutils -Requires: gzip +Requires: grep +Requires: sed Requires(pre): %{name} = %{version} +BuildArch: noarch %description scripts This package contains scripts that help integrate Plymouth with @@ -189,7 +190,7 @@ Requires: libply-splash-graphics%{so_version} = %{version} %description plugin-label-ft This package contains the label control plugin for 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 @@ -340,10 +341,9 @@ This package contains the "bgrt" boot splash theme for Plymouth. %prep -%autosetup -S git +%setup -q +%autopatch -p1 autoreconf -ivf -Wno-portabilty -# replace builddate with patch0date -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 From 13d42ca2d98ba2281a691430f506cd3548c748f2122a3897be591dea083c7ff8 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Fri, 3 Apr 2020 09:24:42 +0000 Subject: [PATCH 06/10] Accepting request 791142 from home:qzhao:branches:Base:System Add plymouth-dracut-path back to resolve the openQA failure. OBS-URL: https://build.opensuse.org/request/show/791142 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=249 --- plymouth-dracut-path.patch | 14 ++++++++++++++ plymouth.changes | 2 -- plymouth.spec | 10 ++++++---- 3 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 plymouth-dracut-path.patch diff --git a/plymouth-dracut-path.patch b/plymouth-dracut-path.patch new file mode 100644 index 0000000..5589ef3 --- /dev/null +++ b/plymouth-dracut-path.patch @@ -0,0 +1,14 @@ +diff -Nura plymouth-0.9.5+git20191224+d7c737d/scripts/plymouth-populate-initrd.in plymouth-0.9.5+git20191224+d7c737d_new/scripts/plymouth-populate-initrd.in +--- plymouth-0.9.5+git20191224+d7c737d/scripts/plymouth-populate-initrd.in 2020-04-03 11:27:53.666924816 +0800 ++++ plymouth-0.9.5+git20191224+d7c737d_new/scripts/plymouth-populate-initrd.in 2020-04-03 12:19:37.642127397 +0800 +@@ -414,8 +414,8 @@ + ddebug "Running with PLYMOUTH_LDD_PATH=$PLYMOUTH_LDD_PATH" + + 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 diff --git a/plymouth.changes b/plymouth.changes index 724b2f9..e653076 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -29,8 +29,6 @@ Tue Dec 24 08:49:24 UTC 2019 - Cliff Zhao * drm: Mark buffer as clean in ply_renderer_head_new() * throbgress: Remove the throbgress plugin * boot-splash: fix memory leak in error path. -- 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. diff --git a/plymouth.spec b/plymouth.spec index cbcb877..a8a44ba 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -32,14 +32,16 @@ Group: System/Base URL: https://www.freedesktop.org/wiki/Software/Plymouth 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. -Patch0: plymouth-some-greenish-openSUSE-colors.patch +Patch1: plymouth-some-greenish-openSUSE-colors.patch # PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation -Patch1: plymouth-manpages.patch +Patch2: plymouth-manpages.patch # PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch. -Patch2: plymouth-only_use_fb_for_cirrus_bochs.patch +Patch3: plymouth-only_use_fb_for_cirrus_bochs.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. -Patch3: plymouth-avoid-umount-hanging-shutdown.patch +Patch4: plymouth-avoid-umount-hanging-shutdown.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. 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. From 5b29abcbc3c19f1ca6f98c1156ef62a7c1199c07bdcbafde36a0bb0551c6add3 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Fri, 3 Apr 2020 09:30:45 +0000 Subject: [PATCH 07/10] Accepting request 791145 from home:qzhao:branches:Base:System Add plymouth-dracut-path back to resolve the openQA failure. OBS-URL: https://build.opensuse.org/request/show/791145 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=250 --- plymouth.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plymouth.spec b/plymouth.spec index a8a44ba..7ab06fa 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -33,7 +33,7 @@ URL: https://www.freedesktop.org/wiki/Software/Plymouth 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 +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. Patch1: plymouth-some-greenish-openSUSE-colors.patch # PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation From b53d99b0e4ef6416ab5c86bf6e9aa21b5daabe7251abf476e739d00962484252 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Thu, 9 Apr 2020 08:35:56 +0000 Subject: [PATCH 08/10] Accepting request 792656 from home:qzhao:branches:Base:System - Update to version plymouth-0.9.5+git20191224+d7c737d. - 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. OBS-URL: https://build.opensuse.org/request/show/792656 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=251 --- plymouth-disable-fedora-logo.patch | 9 ++++++ plymouth.changes | 5 ++++ plymouth.spec | 47 +++++++++++++++--------------- 3 files changed, 38 insertions(+), 23 deletions(-) create mode 100644 plymouth-disable-fedora-logo.patch diff --git a/plymouth-disable-fedora-logo.patch b/plymouth-disable-fedora-logo.patch new file mode 100644 index 0000000..20b6e90 --- /dev/null +++ b/plymouth-disable-fedora-logo.patch @@ -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 ++ diff --git a/plymouth.changes b/plymouth.changes index e653076..ca8120c 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -29,6 +29,11 @@ Tue Dec 24 08:49:24 UTC 2019 - Cliff Zhao * 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. diff --git a/plymouth.spec b/plymouth.spec index 7ab06fa..1d74df2 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -20,8 +20,8 @@ # it is not used in the production environment. %bcond_with x11_renderer -%global so_version 5 %global git_version git20191224+d7c737d +%global so_version 5 Name: plymouth Version: 0.9.5+%{git_version} @@ -32,16 +32,16 @@ Group: System/Base URL: https://www.freedesktop.org/wiki/Software/Plymouth 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. -Patch1: plymouth-some-greenish-openSUSE-colors.patch +Patch0: plymouth-some-greenish-openSUSE-colors.patch # PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation -Patch2: plymouth-manpages.patch +Patch1: plymouth-manpages.patch # PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch. -Patch3: plymouth-only_use_fb_for_cirrus_bochs.patch +Patch2: plymouth-only_use_fb_for_cirrus_bochs.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. -Patch4: plymouth-avoid-umount-hanging-shutdown.patch +Patch3: plymouth-avoid-umount-hanging-shutdown.patch +# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE. +Patch4: plymouth-disable-fedora-logo.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. 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. @@ -73,13 +73,13 @@ BuildRequires: pkgconfig(systemd) >= 186 %if %{with x11_renderer} BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 %endif + Recommends: %{name}-lang Requires: %{name}-branding Requires: systemd >= 186 Requires(post): coreutils Requires(post): plymouth-scripts = %{version} Requires(postun): coreutils -Recommends: plymouth-plugin-label-ft Suggests: plymouth-plugin-label Provides: bootsplash = 3.5 Obsoletes: bootsplash < 3.5 @@ -97,6 +97,7 @@ Summary: Plymouth core library Group: Development/Libraries/C and C++ %description -n libply-boot-client%{so_version} + This package contains the libply-boot-client library used by Plymouth. %package -n libply-splash-core%{so_version} @@ -331,7 +332,6 @@ plugin. %package theme-bgrt Summary: Plymouth "bgrt" theme -# Uses images from spinner theme Group: System/Base Requires: %{name}-plugin-two-step = %{version} Requires: %{name}-theme-spinner = %{version} @@ -345,7 +345,8 @@ Plymouth. %prep %setup -q %autopatch -p1 -autoreconf -ivf -Wno-portabilty +autoreconf -ivf + # Change the default theme %if 0%{?is_opensuse} sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults @@ -360,8 +361,6 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults --disable-silent-rules \ --disable-static \ --disable-upstart-monitoring \ - --disable-tests \ - --disable-libkms \ --with-release-file=%{_sysconfdir}/os-release \ --with-boot-tty=/dev/tty7 \ --with-shutdown-tty=/dev/tty1 \ @@ -370,10 +369,8 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults --with-background-color=0x3391cd \ --without-rhgb-compat-link \ --without-system-root-install \ - --bindir=/bin \ - --sbindir=/sbin \ %if %{without x11_renderer} - --disable-gtk + --disable-gtk %endif make %{?_smp_mflags} @@ -382,11 +379,14 @@ make %{?_smp_mflags} %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 -rf %{buildroot}%{_libdir}/plymouth/glow.so -rm -rf %{buildroot}%{_datadir}/plymouth/themes/spinfinity/header-image.png +rm -f %{buildroot}%{_libdir}/plymouth/glow.so find %{buildroot} -type f -name "*.la" -delete -print @@ -504,7 +504,8 @@ fi %dir %{_sysconfdir}/plymouth %config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/bootlog -/sbin/plymouthd +%{_sbindir}/plymouthd +%{_bindir}/plymouth /bin/plymouth %{_libdir}/plymouth/details.so %{_libdir}/plymouth/text.so @@ -551,7 +552,7 @@ fi %files scripts %dir %{_libexecdir}/plymouth -/sbin/plymouth-set-default-theme +%{_sbindir}/plymouth-set-default-theme %{_libexecdir}/plymouth/plymouth-update-initrd %if %{with x11_renderer} @@ -577,7 +578,7 @@ fi %{_datadir}/plymouth/themes/spinfinity/* %files plugin-space-flares -%{_libdir}/plymouth/space-flares.so +%{_libdir}/plymouth/* %files theme-spinner %dir %{_datadir}/plymouth/themes/spinner @@ -592,13 +593,13 @@ fi %{_datadir}/plymouth/themes/tribar/* %files plugin-two-step -%{_libdir}/plymouth/two-step.so +%{_libdir}/plymouth/* %files plugin-tribar -%{_libdir}/plymouth/tribar.so +%{_libdir}/plymouth/* %files plugin-script -%{_libdir}/plymouth/script.so +%{_libdir}/plymouth/* %files theme-script %dir %{_datadir}/plymouth/themes/script/ From 142871c3ca79666da784d637adb684c8ee9605399ac07932bc46389845cd1f02 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Thu, 9 Apr 2020 13:49:00 +0000 Subject: [PATCH 09/10] Accepting request 792748 from home:qzhao:branches:Base:System Drop plymouth-dracut-path.patch, which is un-used now. OBS-URL: https://build.opensuse.org/request/show/792748 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=252 --- plymouth-dracut-path.patch | 14 -------------- plymouth.spec | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 plymouth-dracut-path.patch diff --git a/plymouth-dracut-path.patch b/plymouth-dracut-path.patch deleted file mode 100644 index 5589ef3..0000000 --- a/plymouth-dracut-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nura plymouth-0.9.5+git20191224+d7c737d/scripts/plymouth-populate-initrd.in plymouth-0.9.5+git20191224+d7c737d_new/scripts/plymouth-populate-initrd.in ---- plymouth-0.9.5+git20191224+d7c737d/scripts/plymouth-populate-initrd.in 2020-04-03 11:27:53.666924816 +0800 -+++ plymouth-0.9.5+git20191224+d7c737d_new/scripts/plymouth-populate-initrd.in 2020-04-03 12:19:37.642127397 +0800 -@@ -414,8 +414,8 @@ - ddebug "Running with PLYMOUTH_LDD_PATH=$PLYMOUTH_LDD_PATH" - - 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 diff --git a/plymouth.spec b/plymouth.spec index 1d74df2..98ef177 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -1,7 +1,7 @@ # # spec file for package plymouth # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 709c51ca65dcb98ad22e6a5a587aa6334c6809ccdc4ba3c5f721a8dcde5dde57 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Fri, 10 Apr 2020 07:37:06 +0000 Subject: [PATCH 10/10] Accepting request 792895 from home:qzhao:branches:Base:System some packages file list are a bit too laxed. OBS-URL: https://build.opensuse.org/request/show/792895 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=253 --- plymouth.spec | 68 ++++++++++----------------------------------------- 1 file changed, 13 insertions(+), 55 deletions(-) diff --git a/plymouth.spec b/plymouth.spec index 98ef177..58ef949 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -1,7 +1,7 @@ # # spec file for package plymouth # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -73,7 +73,6 @@ BuildRequires: pkgconfig(systemd) >= 186 %if %{with x11_renderer} BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 %endif - Recommends: %{name}-lang Requires: %{name}-branding Requires: systemd >= 186 @@ -425,19 +424,6 @@ fi %postun -n libply-splash-graphics%{so_version} -p /sbin/ldconfig %post -n libply%{so_version} -p /sbin/ldconfig %postun -n libply%{so_version} -p /sbin/ldconfig -%post theme-spinfinity -if [ $1 -eq 1 ]; then - set -x - export LIB=%{_libdir} - OTHEME="$(%{_sbindir}/plymouth-set-default-theme)" - if [ "$OTHEME" = "text" ]; then - if [ ! -e /.buildenv ]; then - %{_sbindir}/plymouth-set-default-theme -R spinfinity - else - %{_sbindir}/plymouth-set-default-theme spinfinity - fi - fi -fi %postun theme-spinfinity if [ $1 -eq 0 ]; then @@ -447,20 +433,6 @@ if [ $1 -eq 0 ]; then fi fi -%post theme-fade-in -if [ $1 -eq 1 ]; then - set -x - export LIB=%{_libdir} - OTHEME="$(%{_sbindir}/plymouth-set-default-theme)" - if [ "$OTHEME" = "text" ]; then - if [ ! -e /.buildenv ]; then - %{_sbindir}/plymouth-set-default-theme -R fade-in - else - %{_sbindir}/plymouth-set-default-theme fade-in - fi - fi -fi - %postun theme-fade-in if [ $1 -eq 0 ]; then export LIB=%{_libdir} @@ -469,20 +441,6 @@ if [ $1 -eq 0 ]; then fi fi -%post theme-solar -if [ $1 -eq 1 ]; then - set -x - export LIB=%{_libdir} - OTHEME="$(%{_sbindir}/plymouth-set-default-theme)" - if [ "$OTHEME" = "text" ]; then - if [ ! -e /.buildenv ]; then - %{_sbindir}/plymouth-set-default-theme -R solar - else - %{_sbindir}/plymouth-set-default-theme solar - fi - fi -fi - %postun theme-solar if [ $1 -eq 0 ]; then export LIB=%{_libdir} @@ -569,6 +527,18 @@ fi %files plugin-fade-throbber %{_libdir}/plymouth/fade-throbber.so +%files plugin-space-flares +%{_libdir}/plymouth/space-flares.so + +%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-fade-in %dir %{_datadir}/plymouth/themes/fade-in %{_datadir}/plymouth/themes/fade-in/* @@ -577,9 +547,6 @@ fi %dir %{_datadir}/plymouth/themes/spinfinity %{_datadir}/plymouth/themes/spinfinity/* -%files plugin-space-flares -%{_libdir}/plymouth/* - %files theme-spinner %dir %{_datadir}/plymouth/themes/spinner %{_datadir}/plymouth/themes/spinner/* @@ -592,15 +559,6 @@ fi %dir %{_datadir}/plymouth/themes/tribar %{_datadir}/plymouth/themes/tribar/* -%files plugin-two-step -%{_libdir}/plymouth/* - -%files plugin-tribar -%{_libdir}/plymouth/* - -%files plugin-script -%{_libdir}/plymouth/* - %files theme-script %dir %{_datadir}/plymouth/themes/script/ %{_datadir}/plymouth/themes/script/*