From cb85d4f66e46dcd8d8c135b6ea641ebe30e9462834b6bc8808eb7f2ba32f2723 Mon Sep 17 00:00:00 2001
From: Cliff Zhao <qzhao@suse.com>
Date: Tue, 29 Sep 2020 01:01:40 +0000
Subject: [PATCH] Accepting request 838342 from
 home:StefanBruens:branches:Base:System

- Remove gnu-unifont-bitmap-fonts runtime dependency, it is not
  used anywhere.
- Remove unused kernel-headers and module-init-tools build deps.
- Make plymouth-scripts noarch, correct its runtime dependencies.
- Clean up spec file.

OBS-URL: https://build.opensuse.org/request/show/838342
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=271
---
 plymouth.changes |  9 +++++++++
 plymouth.spec    | 31 +++++++++++++++----------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/plymouth.changes b/plymouth.changes
index 971b41d..e0ec6ef 100644
--- a/plymouth.changes
+++ b/plymouth.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Sep 28 16:32:43 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Remove gnu-unifont-bitmap-fonts runtime dependency, it is not
+  used anywhere.
+- Remove unused kernel-headers and module-init-tools build deps.
+- Make plymouth-scripts noarch, correct its runtime dependencies.
+- Clean up spec file.
+
 -------------------------------------------------------------------
 Sat Aug 29 06:13:50 UTC 2020 - Cliff Zhao <qzhao@suse.com>
 
diff --git a/plymouth.spec b/plymouth.spec
index a1e1777..079b1a2 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -32,7 +32,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-dracut-path.patch tittiatcoke@gmail.com -- Prefix is /usr/sbin and /usr/bin
@@ -56,13 +56,15 @@ Patch1002:      0003-fix_null_deref.patch
 BuildRequires:  automake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  gcc
-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
-# needed for systemd-tty-ask-password-agent
+%endif
 BuildRequires:  intltool
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
@@ -72,13 +74,13 @@ BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libsystemd) >= 186
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(pango) >= 1.21.0
+# needed for systemd-tty-ask-password-agent
 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
 Requires:       systemd >= 186
 Requires(post): coreutils
 Requires(post): plymouth-scripts = %{version}
@@ -136,7 +138,7 @@ Conflicts:      %{name}-branding
 BuildArch:      noarch
 
 %description branding-upstream
-This package contains the /usr/share/plymouthd.defaults which contains the basic 
+This package contains the /usr/share/plymouthd.defaults which contains the basic
 settings and branding from the upstream.
 
 %package devel
@@ -177,12 +179,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
@@ -207,7 +209,7 @@ Requires:       libply-splash-graphics%{soversion} = %{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
@@ -369,16 +371,13 @@ BuildArch:      noarch
 
 %description theme-bgrt
 This package contains the "bgrt" boot splash theme for
-Plymouth. 
+Plymouth.
 
 %prep
 %setup -q
 %autopatch -p1
 autoreconf -ivf
 
-# replace builddate with patch0date
-sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c
-
 %build
 %configure \
            --enable-systemd-integration                          \
@@ -398,7 +397,7 @@ sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c
            --with-background-end-color-stop=0x4EA65C             \
            --with-background-color=0x3391cd                      \
            --without-rhgb-compat-link                            \
-           --without-system-root-install                         
+           --without-system-root-install
 
 make %{?_smp_mflags}