From 567226e1490e835270bcfc0dc1f2580c8a0f85775a057a9af7c525a8374ae1e0 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Sat, 18 Apr 2020 08:20:10 +0000 Subject: [PATCH] Accepting request 795324 from home:qzhao:branches:Base:System - Update to version plymouth-0.9.5+git20200407+6ca4b5b: plymouthd: fix mode changing before splash is shown. two-step: Center message text within labels if labels are centered. drm: Do not unnecessarily get output info twice. ply-device-manager: Only consume one udev event at a time. two-step: Do not jump to end-animation on halt/reboot if it is disabled two-step: Add UseEndAnimation setting. - Add plymouth-ignore-serial-console.patch: 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 (bnc#1164123). - Add plymouth-disable-fedora-bizcom-theme.patch: Will not compile fedora related theme packages, which openSUSE don't need. - Drop plymouth-avoid-umount-hanging-shutdown.patch: Already merged to upstream. - Drop boot-duration: this is an empty file which can generated after package building. - 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. - 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/795324 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=256 --- plymouth.changes | 2 -- plymouth.spec | 35 ++++++++++++++--------------------- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 47fd153..f9f363e 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -17,8 +17,6 @@ Sat Apr 11 05:11:27 UTC 2020 - Cliff Zhao - Add plymouth-disable-fedora-bizcom-theme.patch: Will not compile fedora related theme packages, which openSUSE don't need. -- Add label-ft: - label-ft plugin will only compile when customer require. - Drop plymouth-avoid-umount-hanging-shutdown.patch: Already merged to upstream. - Drop boot-duration: diff --git a/plymouth.spec b/plymouth.spec index 17e1852..48e9b52 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -18,7 +18,6 @@ %bcond_with x11_renderer %bcond_with fedora_theme -%bcond_with label-ft %global git_version 20200407+6ca4b5b %global so_version 5 @@ -43,14 +42,12 @@ Patch3: plymouth-disable-fedora-logo.patch Patch4: plymouth-disable-fedora-bizcom-theme.patch # PATCH-FIX-OPENSUSE plymouth-ignore-serial-console.patch qzhao@opensuse.org bnc#1164123 -- 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 -%if %{with lable-ft} # 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 -%endif BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc @@ -177,6 +174,17 @@ This package contains the label control plugin for Plymouth. It provides the ability to render text on graphical boot splashes using pango and cairo. +%package plugin-label-ft +Summary: Plymouth FreeType label plugin +Group: System/Base +Requires: fontconfig +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 FreeType + %package plugin-script Summary: Plymouth "script" plugin Group: System/Base @@ -287,19 +295,6 @@ This package provides the X11 renderer which allows to test Plymouth behavior on environments with a valid DISPLAY. %endif -%if %{with label-ft} -%package plugin-label-ft -Summary: Plymouth FreeType label plugin -Group: System/Base -Requires: fontconfig -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 FreeType -%endif - %if %{with fedora_theme} %package plugin-fade-throbber Summary: Plymouth "Fade-Throbber" plugin @@ -575,6 +570,9 @@ fi %files plugin-label %{_libdir}/plymouth/label.so +%files plugin-label-ft +%{_libdir}/plymouth/label-ft.so + %files plugin-script %{_libdir}/plymouth/script.so @@ -609,11 +607,6 @@ fi %{_libdir}/plymouth/renderers/x11* %endif -%if %{with label-ft} -%files plugin-label-ft -%{_libdir}/plymouth/label-ft.so -%endif - %if %{with fedora_theme} %files plugin-fade-throbber %{_libdir}/plymouth/fade-throbber.so