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