From e2974622bf6b1774053beb828d5363cd7da08fca Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 23 Oct 2019 01:41:40 +0200 Subject: [PATCH] Drop our private plymouth-update-initrd copy, it is identical to upstream New upstream git snapshot, with the following fixes: Tweaks to the spinner/bgrt themes to match the gdm/gnome-shell lock screen password entry style tweaks done in GNOME 3.34 Move the keyboard layout and capslock indicator closer to the text field Fix flickering below spinner on hidpi displays: https://gitlab.freedesktop.org/plymouth/plymouth/issues/83 Add logrotate file for /var/log/boot.log so that it does not grow endlessly: https://gitlab.freedesktop.org/plymouth/plymouth/issues/31 Some bgrt fixes for devices with non-upright mounted LCD panels --- .gitignore | 1 + plymouth-update-initrd | 2 -- plymouth.rpmlintrc | 5 +++-- plymouth.spec | 24 ++++++++++++++++++------ sources | 2 +- 5 files changed, 23 insertions(+), 11 deletions(-) delete mode 100644 plymouth-update-initrd diff --git a/.gitignore b/.gitignore index 45b0818..bb55bc2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ plymouth-0.8.4.tar.bz2 /plymouth-0.9.3.tar.xz /plymouth-0.9.4.tar.xz /plymouth-a8aad27.tar.gz +/plymouth-32c097c.tar.gz diff --git a/plymouth-update-initrd b/plymouth-update-initrd deleted file mode 100644 index 4ed5709..0000000 --- a/plymouth-update-initrd +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -dracut -f diff --git a/plymouth.rpmlintrc b/plymouth.rpmlintrc index e44bfd9..bb84726 100644 --- a/plymouth.rpmlintrc +++ b/plymouth.rpmlintrc @@ -5,5 +5,6 @@ addFilter("no-documentation") addFilter("dangling-symlink") # Suppress the error from the ghosted /var/lib/plymouth/boot-duration file addFilter("non-readable") -# FIXME: we need to stop using /var/run and use /run instead -addFilter("dir-or-file-in-var-run") +# Upstream (and RHEL) has named the logrotate file after the logfilename +# rather then after the package-name +addFilter("incoherent-logrotate-file") diff --git a/plymouth.spec b/plymouth.spec index 0f7e0dc..1d6d3cc 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -1,17 +1,16 @@ -%global commit a8aad2799c5ca176ee3fb59bbea5ecf30262925a -%global commitdate 20191001 +%global commit 32c097cbcae1d106db4a75337a78310ad22267be +%global commitdate 20191022 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Summary: Graphical Boot Animation and Logger Name: plymouth Version: 0.9.4 -Release: 10.%{commitdate}git%{shortcommit}%{?dist} +Release: 11.%{commitdate}git%{shortcommit}%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/Plymouth Source0: https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Source2: charge.plymouth -Source3: plymouth-update-initrd # Upstream has bumped the soname because some obscure symbols were dropped, # but we really do not want to change soname in Fedora during a cycle. @@ -33,6 +32,7 @@ BuildRequires: intltool Requires: %{name}-core-libs = %{version}-%{release} Requires: %{name}-scripts = %{version}-%{release} +Suggests: logrotate %description Plymouth provides an attractive graphical boot animation in @@ -234,6 +234,7 @@ sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults --with-background-start-color-stop=0x0073B3 \ --with-background-end-color-stop=0x00457E \ --with-background-color=0x3391cd \ + --with-runtimedir=/run \ --disable-gdm-transition \ --enable-systemd-integration \ --without-system-root-install \ @@ -247,7 +248,6 @@ sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults find $RPM_BUILD_ROOT -name '*.la' -delete mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth -install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libexecdir}/plymouth # Add charge, our old default mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge @@ -325,6 +325,7 @@ fi %dir %{_libdir}/plymouth/renderers %dir %{_sysconfdir}/plymouth %config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/bootlog %{_sbindir}/plymouthd %{_bindir}/plymouth %{_libdir}/plymouth/details.so @@ -334,7 +335,6 @@ fi %{_datadir}/plymouth/themes/text/text.plymouth %{_datadir}/plymouth/themes/tribar/tribar.plymouth %{_datadir}/plymouth/plymouthd.defaults -%{_localstatedir}/run/plymouth %{_localstatedir}/spool/plymouth %{_mandir}/man?/* %ghost %{_localstatedir}/lib/plymouth/boot-duration @@ -410,6 +410,18 @@ fi %changelog +* Tue Oct 22 2019 Hans de Goede - 0.9.4-11.20191022git32c097c +- Drop our private plymouth-update-initrd copy, it is identical to upstream +- New upstream git snapshot, with the following fixes: +- Tweaks to the spinner/bgrt themes to match the gdm/gnome-shell lock screen + password entry style tweaks done in GNOME 3.34 +- Move the keyboard layout and capslock indicator closer to the text field +- Fix flickering below spinner on hidpi displays: + https://gitlab.freedesktop.org/plymouth/plymouth/issues/83 +- Add logrotate file for /var/log/boot.log so that it does not grow endlessly: + https://gitlab.freedesktop.org/plymouth/plymouth/issues/31 +- Some bgrt fixes for devices with non-upright mounted LCD panels + * Tue Oct 1 2019 Hans de Goede - 0.9.4-10.20191001gita8aad27 - We are carrying so much patches from upstream that we are practically following upstream master, switch to a git snapshot diff --git a/sources b/sources index 460fe6c..7802306 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plymouth-a8aad27.tar.gz) = 99bac47a0dfe55c226ef470104c3a9cbd707e071e22449c7135d627aff861e5e1580ee0d7d24b5b6d9acfc8ac341cff4a218a743cdb176555e09e427af862880 +SHA512 (plymouth-32c097c.tar.gz) = 479d9a7b27ad676fb3ce118269da947ebb95c2d7800945ea261d8aa70d0456ad51d51d5294b7d1a4d0ee87e248b6d3ff68334e4f9d3297ecda0c8131a44da979