rpm/plymouth
SHA256
1
0
Fork 0
forked from pool/plymouth
Code Pull Requests Activity

Accepting request 794735 from home:qzhao:branches:Base:System

Browse Source 
- 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.
- 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:
  this is an empty file which can generated after package building.

OBS-URL: https://build.opensuse.org/request/show/794735
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=255
This commit is contained in:
Cliff Zhao 2020-04-17 03:14:58 +00:00 committed by Git OBS Bridge
parent 709c51ca65
commit 8e1659f060
8 changed files with 297 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
boot-duration
View File

3
plymouth-0.9.5+git20191224+d7c737d.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0e608b5e72dd721167d1ea348ee3fd06ca69479c19f5c1c589f05c280720b57e
size 6006168

3
plymouth-0.9.5+git20200407+6ca4b5b.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:967ff748ed7a78f5398adedc922c77c3b4b33209adc76f5105803751c68afd05
size 6031260

19
plymouth-avoid-umount-hanging-shutdown.patch
View File

@ -1,19 +0,0 @@
diff -Nura plymouth-0.9.5+git20190908+3abfab2/src/libply/ply-terminal-session.c plymouth-0.9.5+git20190908+3abfab2_new/src/libply/ply-terminal-session.c
--- plymouth-0.9.5+git20190908+3abfab2/src/libply/ply-terminal-session.c 2019-09-09 07:31:37.000000000 +0000
+++ plymouth-0.9.5+git20190908+3abfab2_new/src/libply/ply-terminal-session.c 2019-09-11 07:41:17.432945317 +0000
@@ -183,6 +183,7 @@
ply_trace (" opened device '/dev/ptmx'");
+#if 0
ply_trace ("creating pseudoterminal");
if (grantpt (session->pseudoterminal_master_fd) < 0) {
ply_save_errno ();
@@ -192,6 +193,7 @@
return false;
}
ply_trace ("done creating pseudoterminal");
+#endif
ply_trace ("unlocking pseudoterminal");
if (unlockpt (session->pseudoterminal_master_fd) < 0) {

14
plymouth-disable-fedora-bizcom-theme.patch Normal file
View File

@ -0,0 +1,14 @@
diff -Nura plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/src/plugins/splash/Makefile.am
--- plymouth-0.9.5+git20191224+d7c737d/src/plugins/splash/Makefile.am 2020-01-02 17:03:18.000000000 +0800
+++ plymouth-0.9.5+git20191224+d7c737d_new/src/plugins/splash/Makefile.am 2020-04-10 22:35:52.759365963 +0800
@@ -1,2 +1,2 @@
-SUBDIRS = fade-throbber text details space-flares two-step script tribar
+SUBDIRS = text details two-step script tribar
MAINTAINERCLEANFILES = Makefile.in
diff -Nura plymouth-0.9.5+git20191224+d7c737d/themes/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/themes/Makefile.am
--- plymouth-0.9.5+git20191224+d7c737d/themes/Makefile.am 2020-01-02 17:03:18.000000000 +0800
+++ plymouth-0.9.5+git20191224+d7c737d_new/themes/Makefile.am 2020-04-10 21:07:15.395978166 +0800
@@ -1,2 +1,2 @@
-SUBDIRS = spinfinity fade-in text details solar glow script spinner tribar bgrt
+SUBDIRS = spinfinity text details script spinner tribar bgrt
MAINTAINERCLEANFILES = Makefile.in

13
plymouth-ignore-serial-console.patch Normal file
View File

@ -0,0 +1,13 @@
diff -Nura plymouth-0.9.5+git20191224+d7c737d/src/main.c plymouth-0.9.5+git20191224+d7c737d_new/src/main.c
--- plymouth-0.9.5+git20191224+d7c737d/src/main.c 2020-01-02 17:03:18.000000000 +0800
+++ plymouth-0.9.5+git20191224+d7c737d_new/src/main.c 2020-04-11 12:34:22.295210835 +0800
@@ -2241,8 +2241,7 @@
find_system_default_splash (&state);
find_distribution_default_splash (&state);
- if (ply_kernel_command_line_has_argument ("plymouth.ignore-serial-consoles"))
- device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES;
+ device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES;
if (ply_kernel_command_line_has_argument ("plymouth.ignore-udev") ||
(getenv ("DISPLAY") != NULL))

26
plymouth.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Sat Apr 11 05:11:27 UTC 2020 - Cliff Zhao <qzhao@suse.com>
- 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.
- 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:
this is an empty file which can generated after package building.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 13 19:25:54 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de> Thu Feb 13 19:25:54 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

415
plymouth.spec
View File

@ -16,38 +16,41 @@
# #
# plymouth's X11 renderer adds many GTK3 packages to the build cycle,
# it is not used in the production environment.
%bcond_with x11_renderer %bcond_with x11_renderer
%bcond_with fedora_theme
%bcond_with label-ft
%global git_version git20191224+d7c737d %global git_version 20200407+6ca4b5b
%global so_version 5 %global so_version 5
Name: plymouth Name: plymouth
Version: 0.9.5+%{git_version} Version: 0.9.5+git%{git_version}
Release: 0 Release: 0
Summary: Graphical Boot Animation and Logger Summary: Graphical Boot Animation and Logger
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Base Group: System/Base
URL: https://www.freedesktop.org/wiki/Software/Plymouth URL: https://www.freedesktop.org/wiki/Software/Plymouth
Source0: %{name}-%{version}.tar.xz 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. # PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com -- To use suse colors in tribar.
Patch0: plymouth-some-greenish-openSUSE-colors.patch Patch0: plymouth-some-greenish-openSUSE-colors.patch
# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation # PATCH-FIX-OPENSUSE plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation
Patch1: plymouth-manpages.patch Patch1: plymouth-manpages.patch
# PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch. # PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch.
Patch2: plymouth-only_use_fb_for_cirrus_bochs.patch Patch2: plymouth-only_use_fb_for_cirrus_bochs.patch
# PATCH-FIX-OPENSUSE plymouth-avoid-umount-hanging-shutdown.patch bnc#1105688, bnc#1129386, bnc#1134660 qzhao@opensuse.org -- Drop grantpt() to avoid system failed to unmount /var during shutdown.
Patch3: plymouth-avoid-umount-hanging-shutdown.patch
# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE. # PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE.
Patch4: plymouth-disable-fedora-logo.patch Patch3: plymouth-disable-fedora-logo.patch
# PATCH-FIX-OPENSUSE plymouth-disable-fedora-bizcom-theme.patch qzhao@opensuse.org -- Disable to compile fedora related themes.
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. # 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 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. # 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 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. # 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 Patch1002: 0003-fix_null_deref.patch
%endif
BuildRequires: automake BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc BuildRequires: gcc
@ -55,12 +58,6 @@ BuildRequires: intltool
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libxslt BuildRequires: libxslt
BuildRequires: pkgconfig 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: update-desktop-files
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cairo)
@ -73,6 +70,12 @@ BuildRequires: pkgconfig(systemd) >= 186
%if %{with x11_renderer} %if %{with x11_renderer}
BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
%endif %endif
%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
Recommends: %{name}-lang Recommends: %{name}-lang
Requires: %{name}-branding Requires: %{name}-branding
Requires: systemd >= 186 Requires: systemd >= 186
@ -150,15 +153,6 @@ Supplements: packageand(plymouth:dracut)
%description dracut %description dracut
This package contains utilities that integrate dracut with Plymouth This package contains utilities that integrate dracut with Plymouth
%package x11-renderer
Summary: Plymouth X11 renderer
Group: System/Base
Requires: %{name} = %{version}
%description x11-renderer
This package provides the X11 renderer which allows to test plymouth
behavior on environments with a valid DISPLAY.
%package scripts %package scripts
Summary: Plymouth related scripts Summary: Plymouth related scripts
Group: System/Base Group: System/Base
@ -183,55 +177,6 @@ This package contains the label control plugin for
Plymouth. It provides the ability to render text on Plymouth. It provides the ability to render text on
graphical boot splashes using pango and cairo. 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-fade-throbber
Summary: Plymouth "Fade-Throbber" plugin
Group: System/Base
Requires: libply%{so_version} = %{version}
Requires: libply-splash-core%{so_version} = %{version}
Requires: libply-splash-graphics%{so_version} = %{version}
%description plugin-fade-throbber
This package contains the "Fade-In" boot splash plugin for
Plymouth. It features a centered image that fades in and out
while other images pulsate around during system boot up.
%package plugin-space-flares
Summary: Plymouth "space-flares" plugin
Group: System/Base
Requires: %{name}-plugin-label = %{version}
Requires: libply%{so_version} = %{version}
Requires: libply-splash-core%{so_version} = %{version}
Requires: libply-splash-graphics%{so_version} = %{version}
%description plugin-space-flares
This package contains the "space-flares" boot splash plugin for
Plymouth. It features a corner image with animated flares.
%package plugin-two-step
Summary: Plymouth "two-step" plugin
Group: System/Base
Requires: libply%{so_version} = %{version}
Requires: libply-splash-core%{so_version} = %{version}
Requires: libply-splash-graphics%{so_version} = %{version}
Requires: plymouth-plugin-label = %{version}
%description plugin-two-step
This package contains the "two-step" boot splash plugin for
Plymouth. It features a two phased boot process that starts with
a progressing animation synced to boot time and finishes with a
short, fast one-shot animation.
%package plugin-script %package plugin-script
Summary: Plymouth "script" plugin Summary: Plymouth "script" plugin
Group: System/Base Group: System/Base
@ -258,18 +203,43 @@ Plymouth. It features an extensible, scriptable boot splash
language that simplifies the process of designing custom language that simplifies the process of designing custom
boot splash themes. boot splash themes.
%package theme-fade-in %package plugin-two-step
Summary: Plymouth "Fade-In" theme Summary: Plymouth "two-step" plugin
Group: System/Base Group: System/Base
Requires: %{name}-plugin-fade-throbber = %{version} Requires: libply%{so_version} = %{version}
Requires: libply-splash-core%{so_version} = %{version}
Requires: libply-splash-graphics%{so_version} = %{version}
Requires: plymouth-plugin-label = %{version} Requires: plymouth-plugin-label = %{version}
%description plugin-two-step
This package contains the "two-step" boot splash plugin for
Plymouth. It features a two phased boot process that starts with
a progressing animation synced to boot time and finishes with a
short, fast one-shot animation.
%package theme-bgrt
Summary: Plymouth "bgrt" theme
Group: System/Base
Requires: %{name}-plugin-two-step = %{version}
Requires: %{name}-theme-spinner = %{version}
Requires(post): %{name}-scripts Requires(post): %{name}-scripts
BuildArch: noarch BuildArch: noarch
%description theme-fade-in %description theme-bgrt
This package contains the "Fade-In" boot splash theme for This package contains the "bgrt" boot splash theme for
Plymouth. It features a centered logo that fades in and out Plymouth.
while stars twinkle around the logo during system boot up.
%package theme-script
Summary: Plymouth "Script" theme
Group: System/Base
Requires: %{name}-plugin-script = %{version}
Requires(post): %{name}-scripts
BuildArch: noarch
%description theme-script
This package contains the "script" boot splash theme for
Plymouth. It is a simple example theme the uses the "script"
plugin.
%package theme-spinfinity %package theme-spinfinity
Summary: Plymouth "Spinfinity" theme Summary: Plymouth "Spinfinity" theme
@ -295,17 +265,6 @@ BuildArch: noarch
This package contains the "spinner" boot splash theme for This package contains the "spinner" boot splash theme for
Plymouth. Plymouth.
%package theme-solar
Summary: Plymouth "Solar" theme
Group: System/Base
Requires: %{name}-plugin-space-flares = %{version}
Requires(post): %{name}-scripts
BuildArch: noarch
%description theme-solar
This package contains the "Solar" boot splash theme for
Plymouth. It features a blue flamed sun with animated solar flares.
%package theme-tribar %package theme-tribar
Summary: Plymouth "Tribar" theme Summary: Plymouth "Tribar" theme
Group: System/Base Group: System/Base
@ -317,42 +276,96 @@ BuildArch: noarch
This package contains the "Tribar" boot splash theme for This package contains the "Tribar" boot splash theme for
Plymouth Plymouth
%package theme-script %if %{with x11_renderer}
Summary: Plymouth "Script" theme %package x11-renderer
Summary: Plymouth X11 renderer
Group: System/Base Group: System/Base
Requires: %{name}-plugin-script = %{version} Requires: %{name} = %{version}
%description x11-renderer
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
Group: System/Base
Requires: libply%{so_version} = %{version}
Requires: libply-splash-core%{so_version} = %{version}
Requires: libply-splash-graphics%{so_version} = %{version}
%description plugin-fade-throbber
This package contains the "Fade-In" boot splash plugin for
Plymouth. It features a centered image that fades in and out
while other images pulsate around during system boot up.
%package theme-fade-in
Summary: Plymouth "Fade-In" theme
Group: System/Base
Requires: %{name}-plugin-fade-throbber = %{version}
Requires: plymouth-plugin-label = %{version}
Requires(post): %{name}-scripts Requires(post): %{name}-scripts
BuildArch: noarch BuildArch: noarch
%description theme-script %description theme-fade-in
This package contains the "script" boot splash theme for This package contains the "Fade-In" boot splash theme for
Plymouth. It is a simple example theme the uses the "script" Plymouth. It features a centered logo that fades in and out
plugin. while stars twinkle around the logo during system boot up.
%package theme-bgrt %package theme-glow
Summary: Plymouth "bgrt" theme Summary: Plymouth "glow" theme
Group: System/Base Group: System/Base
Requires: %{name}-plugin-two-step = %{version} Requires: %{name}-plugin-tribar = %{version}
Requires: %{name}-theme-spinner = %{version}
Requires(post): %{name}-scripts Requires(post): %{name}-scripts
BuildArch: noarch BuildArch: noarch
%description theme-bgrt %description theme-glow
This package contains the "bgrt" boot splash theme for This package contains the "glow" boot splash theme for
Plymouth. Plymouth
%package plugin-space-flares
Summary: Plymouth "space-flares" plugin
Group: System/Base
Requires: %{name}-plugin-label = %{version}
Requires: libply%{so_version} = %{version}
Requires: libply-splash-core%{so_version} = %{version}
Requires: libply-splash-graphics%{so_version} = %{version}
%description plugin-space-flares
This package contains the "space-flares" boot splash plugin for
Plymouth. It features a corner image with animated flares.
%package theme-solar
Summary: Plymouth "Solar" theme
Group: System/Base
Requires: %{name}-plugin-space-flares = %{version}
Requires(post): %{name}-scripts
BuildArch: noarch
%description theme-solar
This package contains the "Solar" boot splash theme for
Plymouth. It features a blue flamed sun with animated solar flares.
%endif
%prep %prep
%setup -q %setup -q
%autopatch -p1 %autopatch -p1
autoreconf -ivf autoreconf -ivf
# Change the default theme
%if 0%{?is_opensuse}
sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults
%else
sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
%endif
%build %build
%configure \ %configure \
--enable-systemd-integration \ --enable-systemd-integration \
@ -367,6 +380,7 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
--with-background-end-color-stop=0x4EA65C \ --with-background-end-color-stop=0x4EA65C \
--with-background-color=0x3391cd \ --with-background-color=0x3391cd \
--without-rhgb-compat-link \ --without-rhgb-compat-link \
--without-logo \
--without-system-root-install \ --without-system-root-install \
%if %{without x11_renderer} %if %{without x11_renderer}
--disable-gtk --disable-gtk
@ -376,28 +390,32 @@ make %{?_smp_mflags}
%install %install
%make_install %make_install
rm -f %{buildroot}/%{_bindir}/rhgb-client
#Link the plymouth client binary also to /bin until the move to /usr is completed
mkdir %{buildroot}/bin
(cd %{buildroot}/bin; ln -s ..%{_bindir}/plymouth)
# Glow isn't quite ready for primetime
rm -rf %{buildroot}%{_datadir}/plymouth/glow/
rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/
rm -f %{buildroot}%{_libdir}/plymouth/glow.so
find %{buildroot} -type f -name "*.la" -delete -print
# Create necessary directories:
mkdir -p %{buildroot}%{_localstatedir}/lib/plymouth mkdir -p %{buildroot}%{_localstatedir}/lib/plymouth
mkdir -p %{buildroot}/run/plymouth mkdir -p %{buildroot}/run/plymouth
mkdir -p %{buildroot}%{_localstatedir}/log mkdir -p %{buildroot}%{_localstatedir}/log
touch %{buildroot}%{_localstatedir}/log/boot.log
touch %{buildroot}%{_localstatedir}/spool/plymouth/boot.log # Copy upstream's default config file to system and change release settings:
cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_datadir}/plymouth/default-boot-duration
cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_localstatedir}/lib/plymouth
cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf
%if 0%{?is_opensuse}
sed -i -e 's/spinner/bgrt/g' %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf
%else
sed -i -e 's/spinner/SLE/g' %{buildroot}/%{_sysconfdir}/plymouth/plymouthd.conf
%endif
# Link the plymouth client binary to /bin to fit display and emergency service requirement:
mkdir %{buildroot}/bin
(cd %{buildroot}/bin; ln -s ..%{_bindir}/plymouth)
# Create boot-duration file for recording boot info:
touch %{buildroot}%{_datadir}/plymouth/default-boot-duration
touch %{buildroot}%{_localstatedir}/lib/plymouth
# Remove temp files which produced during the compilation:
find $RPM_BUILD_ROOT -name '*.la' -delete
%post %post
%{?regenerate_initrd_post} %{?regenerate_initrd_post}
if [ ! -e /.buildenv ]; then if [ ! -e /.buildenv ]; then
@ -416,15 +434,31 @@ fi
%posttrans %posttrans
%{?regenerate_initrd_posttrans} %{?regenerate_initrd_posttrans}
%post -n libply-boot-client%{so_version} -p /sbin/ldconfig %post -n libply-boot-client%{so_version} -p /sbin/ldconfig
%postun -n libply-boot-client%{so_version} -p /sbin/ldconfig %postun -n libply-boot-client%{so_version} -p /sbin/ldconfig
%post -n libply-splash-core%{so_version} -p /sbin/ldconfig %post -n libply-splash-core%{so_version} -p /sbin/ldconfig
%postun -n libply-splash-core%{so_version} -p /sbin/ldconfig %postun -n libply-splash-core%{so_version} -p /sbin/ldconfig
%post -n libply-splash-graphics%{so_version} -p /sbin/ldconfig %post -n libply-splash-graphics%{so_version} -p /sbin/ldconfig
%postun -n libply-splash-graphics%{so_version} -p /sbin/ldconfig %postun -n libply-splash-graphics%{so_version} -p /sbin/ldconfig
%post -n libply%{so_version} -p /sbin/ldconfig %post -n libply%{so_version} -p /sbin/ldconfig
%postun -n libply%{so_version} -p /sbin/ldconfig %postun -n libply%{so_version} -p /sbin/ldconfig
%postun theme-bgrt
if [ $1 -eq 0 ]; then
export LIB=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "bgrt" ]; then
%{_sbindir}/plymouth-set-default-theme -R --reset
fi
fi
%postun theme-script
if [ $1 -eq 0 ]; then
export LIB=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "script" ]; then
%{_sbindir}/plymouth-set-default-theme -R --reset
fi
fi
%postun theme-spinfinity %postun theme-spinfinity
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
export LIB=%{_libdir} export LIB=%{_libdir}
@ -433,6 +467,23 @@ if [ $1 -eq 0 ]; then
fi fi
fi fi
%postun theme-spinner
if [ $1 -eq 0 ]; then
export LIB=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "spinner" ]; then
%{_sbindir}/plymouth-set-default-theme -R --reset
fi
fi
%postun theme-tribar
if [ $1 -eq 0 ]; then
export LIB=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "tribar" ]; then
%{_sbindir}/plymouth-set-default-theme -R --reset
fi
fi
%if %{with fedora_theme}
%postun theme-fade-in %postun theme-fade-in
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
export LIB=%{_libdir} export LIB=%{_libdir}
@ -441,6 +492,14 @@ if [ $1 -eq 0 ]; then
fi fi
fi fi
%postun theme-glow
if [ $1 -eq 0 ]; then
export LIB=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "glow" ]; then
%{_sbindir}/plymouth-set-default-theme -R --reset
fi
fi
%postun theme-solar %postun theme-solar
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
export LIB=%{_libdir} export LIB=%{_libdir}
@ -448,10 +507,9 @@ if [ $1 -eq 0 ]; then
%{_sbindir}/plymouth-set-default-theme -R --reset %{_sbindir}/plymouth-set-default-theme -R --reset
fi fi
fi fi
%endif
%files %files
%license COPYING
%doc AUTHORS NEWS README
%dir %{_datadir}/plymouth %dir %{_datadir}/plymouth
%dir %{_datadir}/plymouth/themes %dir %{_datadir}/plymouth/themes
%dir %{_datadir}/plymouth/themes/details %dir %{_datadir}/plymouth/themes/details
@ -460,11 +518,11 @@ fi
%dir %{_libdir}/plymouth %dir %{_libdir}/plymouth
%dir %{_libdir}/plymouth/renderers %dir %{_libdir}/plymouth/renderers
%dir %{_sysconfdir}/plymouth %dir %{_sysconfdir}/plymouth
/bin/plymouth
%{_bindir}/plymouth
%{_sbindir}/plymouthd
%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf %config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/bootlog %config(noreplace) %{_sysconfdir}/logrotate.d/bootlog
%{_sbindir}/plymouthd
%{_bindir}/plymouth
/bin/plymouth
%{_libdir}/plymouth/details.so %{_libdir}/plymouth/details.so
%{_libdir}/plymouth/text.so %{_libdir}/plymouth/text.so
%{_libdir}/plymouth/renderers/drm* %{_libdir}/plymouth/renderers/drm*
@ -473,13 +531,14 @@ fi
%{_datadir}/plymouth/themes/details/details.plymouth %{_datadir}/plymouth/themes/details/details.plymouth
%{_datadir}/plymouth/themes/text/text.plymouth %{_datadir}/plymouth/themes/text/text.plymouth
%{_datadir}/plymouth/plymouthd.defaults %{_datadir}/plymouth/plymouthd.defaults
%{_datadir}/plymouth/bizcom.png
%ghost /run/plymouth
%{_localstatedir}/spool/plymouth %{_localstatedir}/spool/plymouth
%{_mandir}/man?/*
%ghost %{_localstatedir}/lib/plymouth/boot-duration
%{_unitdir}/* %{_unitdir}/*
%ghost /run/plymouth
%ghost %{_localstatedir}/lib/plymouth/boot-duration
%ghost %{_localstatedir}/log/boot.log %ghost %{_localstatedir}/log/boot.log
%{_mandir}/man?/*
%doc AUTHORS NEWS README
%license COPYING
/usr/share/locale/ /usr/share/locale/
%files dracut %files dracut
@ -513,35 +572,25 @@ fi
%{_sbindir}/plymouth-set-default-theme %{_sbindir}/plymouth-set-default-theme
%{_libexecdir}/plymouth/plymouth-update-initrd %{_libexecdir}/plymouth/plymouth-update-initrd
%if %{with x11_renderer}
%files x11-renderer
%{_libdir}/plymouth/renderers/x11*
%endif
%files plugin-label %files plugin-label
%{_libdir}/plymouth/label.so %{_libdir}/plymouth/label.so
%files plugin-label-ft
%{_libdir}/plymouth/label-ft.so
%files plugin-fade-throbber
%{_libdir}/plymouth/fade-throbber.so
%files plugin-space-flares
%{_libdir}/plymouth/space-flares.so
%files plugin-two-step
%{_libdir}/plymouth/two-step.so
%files plugin-tribar
%{_libdir}/plymouth/tribar.so
%files plugin-script %files plugin-script
%{_libdir}/plymouth/script.so %{_libdir}/plymouth/script.so
%files theme-fade-in %files plugin-tribar
%dir %{_datadir}/plymouth/themes/fade-in %{_libdir}/plymouth/tribar.so
%{_datadir}/plymouth/themes/fade-in/*
%files plugin-two-step
%{_libdir}/plymouth/two-step.so
%files theme-bgrt
%dir %{_datadir}/plymouth/themes/bgrt
%{_datadir}/plymouth/themes/bgrt/*
%files theme-script
%dir %{_datadir}/plymouth/themes/script/
%{_datadir}/plymouth/themes/script/*
%files theme-spinfinity %files theme-spinfinity
%dir %{_datadir}/plymouth/themes/spinfinity %dir %{_datadir}/plymouth/themes/spinfinity
@ -551,20 +600,38 @@ fi
%dir %{_datadir}/plymouth/themes/spinner %dir %{_datadir}/plymouth/themes/spinner
%{_datadir}/plymouth/themes/spinner/* %{_datadir}/plymouth/themes/spinner/*
%files theme-solar
%dir %{_datadir}/plymouth/themes/solar
%{_datadir}/plymouth/themes/solar/*
%files theme-tribar %files theme-tribar
%dir %{_datadir}/plymouth/themes/tribar %dir %{_datadir}/plymouth/themes/tribar
%{_datadir}/plymouth/themes/tribar/* %{_datadir}/plymouth/themes/tribar/*
%files theme-script %if %{with x11_renderer}
%dir %{_datadir}/plymouth/themes/script/ %files x11-renderer
%{_datadir}/plymouth/themes/script/* %{_libdir}/plymouth/renderers/x11*
%endif
%files theme-bgrt %if %{with label-ft}
%dir %{_datadir}/plymouth/themes/bgrt %files plugin-label-ft
%{_datadir}/plymouth/themes/bgrt/* %{_libdir}/plymouth/label-ft.so
%endif
%if %{with fedora_theme}
%files plugin-fade-throbber
%{_libdir}/plymouth/fade-throbber.so
%files theme-fade-in
%dir %{_datadir}/plymouth/themes/fade-in
%{_datadir}/plymouth/themes/fade-in/*
%files theme-glow
%dir %{_datadir}/plymouth/themes/glow
%{_datadir}/plymouth/themes/glow/*
%files plugin-space-flares
%{_libdir}/plymouth/space-flares.so
%files theme-solar
%dir %{_datadir}/plymouth/themes/solar
%{_datadir}/plymouth/themes/solar/*
%endif
%changelog %changelog