From 431292c3c0743c6bdb6d75170c7b4f0c4065a20f76bf95a02b2db0e8553fe0ec Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Fri, 27 Nov 2020 08:24:41 +0000 Subject: [PATCH] Accepting request 851248 from home:qzhao:branches:Base:System Add plymouth-disable-fedora-logo.patch: Disable the image link which point to the fedora logo. this modification will also avoid the failure report from build checker. OBS-URL: https://build.opensuse.org/request/show/851248 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=282 --- plymouth-disable-fedora-logo.patch | 8 ++++++++ plymouth.changes | 10 +++++++++- plymouth.spec | 5 +++-- 3 files changed, 20 insertions(+), 3 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..5577ede --- /dev/null +++ b/plymouth-disable-fedora-logo.patch @@ -0,0 +1,8 @@ +diff -Nura plymouth-0.9.5+git20200921+20778f2/themes/spinfinity/Makefile.am plymouth-0.9.5+git20200921+20778f2_new/themes/spinfinity/Makefile.am +--- plymouth-0.9.5+git20200921+20778f2/themes/spinfinity/Makefile.am 2020-04-11 14:22:34.000000000 +0800 ++++ plymouth-0.9.5+git20200921+20778f2_new/themes/spinfinity/Makefile.am 2020-11-26 22:11:57.472271985 +0800 +@@ -54,4 +54,3 @@ + 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 c07d06b..07181f5 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sat 21 14:26:51 UTC 2020 - Cliff Zhao + +- Add plymouth-disable-fedora-logo.patch: + Disable the image link which point to the fedora logo. this + modification will also avoid the failure report from build + checker. + ------------------------------------------------------------------- Thu Oct 27 06:38:44 UTC 2020 - Cliff Zhao @@ -9,7 +17,7 @@ Thu Oct 27 06:38:44 UTC 2020 - Cliff Zhao ------------------------------------------------------------------- Fri Oct 16 10:16:39 UTC 2020 - Ludwig Nussel -- prepare usrmerge (boo#1029961) +- Update plymouth.spec: prepare usrmerge (boo#1029961) ------------------------------------------------------------------- Wed Oct 7 14:53:06 UTC 2020 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index 3423121..3e6bd81 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 @@ -47,6 +47,8 @@ Patch3: plymouth-manpages.patch Patch4: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch # PATCH-FIX-OPENSUSE plymouth-ignore-serial-console.patch qzhao@opensuse.org bnc#1051692 bnc#1164123 bnc#1170906 -- 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. Patch5: plymouth-ignore-serial-console.patch +# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE. +Patch6: 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. @@ -603,7 +605,6 @@ fi %{_datadir}/plymouth/themes/spinfinity/entry.png %{_datadir}/plymouth/themes/spinfinity/lock.png %{_datadir}/plymouth/themes/spinfinity/capslock.png -%{_datadir}/plymouth/themes/spinfinity/header-image.png %{_datadir}/plymouth/themes/spinfinity/keyboard.png %{_datadir}/plymouth/themes/spinfinity/keymap-render.png %{_datadir}/plymouth/themes/spinfinity/animation-0001.png