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

- Update to version plymouth-0.9.5+git20191224+d7c737d. - Add plymouth-disable-fedora-logo.patch: Disable the logo file which links to fedora custom position, and openSUSE don't have it. - Drop plymouth-dracut-path.patch: Nolonger needed for the latest update. - Drop  plymouth-correct-runtime-dir.patch: Nolonger needed for the latest update. - Porting old patches to fit the latest update. 0001-Add-label-ft-plugin.patch, 0002-Install-label-ft-plugin-into-initrd-if-available.patch - Upstream dropped theme throbgress, So we nolonger build it.

OBS-URL: https://build.opensuse.org/request/show/792656
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=251
This commit is contained in:
Cliff Zhao 2020-04-09 08:35:56 +00:00 committed by Git OBS Bridge
parent 5b29abcbc3
commit b53d99b0e4
3 changed files with 38 additions and 23 deletions

View File

@ -0,0 +1,9 @@
diff -Nura plymouth-0.9.5+git20191224+d7c737d/themes/spinfinity/Makefile.am plymouth-0.9.5+git20191224+d7c737d_new/themes/spinfinity/Makefile.am
--- plymouth-0.9.5+git20191224+d7c737d/themes/spinfinity/Makefile.am 2020-01-02 17:03:18.000000000 +0800
+++ plymouth-0.9.5+git20191224+d7c737d_new/themes/spinfinity/Makefile.am 2020-04-06 10:15:05.040164493 +0800
@@ -54,4 +54,4 @@
EXTRA_DIST = spinfinity.plymouth.in
install-data-hook:
- ln -sf /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(themedir)/header-image.png
+

View File

@ -29,6 +29,11 @@ Tue Dec 24 08:49:24 UTC 2019 - Cliff Zhao <qzhao@suse.com>
* drm: Mark buffer as clean in ply_renderer_head_new()
* throbgress: Remove the throbgress plugin
* boot-splash: fix memory leak in error path.
- Add plymouth-disable-fedora-logo.patch:
Disable the logo file which links to fedora custom position,
and openSUSE don't have it.
- Drop plymouth-dracut-path.patch:
Nolonger needed for the latest update.
- Drop plymouth-correct-runtime-dir.patch:
Nolonger needed for the latest update.
- Porting old patches to fit the latest update.

View File

@ -20,8 +20,8 @@
# it is not used in the production environment.
%bcond_with x11_renderer
%global so_version 5
%global git_version git20191224+d7c737d
%global so_version 5
Name: plymouth
Version: 0.9.5+%{git_version}
@ -32,16 +32,16 @@ Group: System/Base
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
Patch0: plymouth-dracut-path.patch
# PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com -- To use suse colors in tribar.
Patch1: 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
Patch2: 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.
Patch3: 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.
Patch4: plymouth-avoid-umount-hanging-shutdown.patch
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.
Patch4: 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.
@ -73,13 +73,13 @@ BuildRequires: pkgconfig(systemd) >= 186
%if %{with x11_renderer}
BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
%endif
Recommends: %{name}-lang
Requires: %{name}-branding
Requires: systemd >= 186
Requires(post): coreutils
Requires(post): plymouth-scripts = %{version}
Requires(postun): coreutils
Recommends: plymouth-plugin-label-ft
Suggests: plymouth-plugin-label
Provides: bootsplash = 3.5
Obsoletes: bootsplash < 3.5
@ -97,6 +97,7 @@ Summary: Plymouth core library
Group: Development/Libraries/C and C++
%description -n libply-boot-client%{so_version}
This package contains the libply-boot-client library used by Plymouth.
%package -n libply-splash-core%{so_version}
@ -331,7 +332,6 @@ plugin.
%package theme-bgrt
Summary: Plymouth "bgrt" theme
# Uses images from spinner theme
Group: System/Base
Requires: %{name}-plugin-two-step = %{version}
Requires: %{name}-theme-spinner = %{version}
@ -345,7 +345,8 @@ Plymouth.
%prep
%setup -q
%autopatch -p1
autoreconf -ivf -Wno-portabilty
autoreconf -ivf
# Change the default theme
%if 0%{?is_opensuse}
sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults
@ -360,8 +361,6 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
--disable-silent-rules \
--disable-static \
--disable-upstart-monitoring \
--disable-tests \
--disable-libkms \
--with-release-file=%{_sysconfdir}/os-release \
--with-boot-tty=/dev/tty7 \
--with-shutdown-tty=/dev/tty1 \
@ -370,10 +369,8 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
--with-background-color=0x3391cd \
--without-rhgb-compat-link \
--without-system-root-install \
--bindir=/bin \
--sbindir=/sbin \
%if %{without x11_renderer}
--disable-gtk
--disable-gtk
%endif
make %{?_smp_mflags}
@ -382,11 +379,14 @@ make %{?_smp_mflags}
%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 -rf %{buildroot}%{_libdir}/plymouth/glow.so
rm -rf %{buildroot}%{_datadir}/plymouth/themes/spinfinity/header-image.png
rm -f %{buildroot}%{_libdir}/plymouth/glow.so
find %{buildroot} -type f -name "*.la" -delete -print
@ -504,7 +504,8 @@ fi
%dir %{_sysconfdir}/plymouth
%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/bootlog
/sbin/plymouthd
%{_sbindir}/plymouthd
%{_bindir}/plymouth
/bin/plymouth
%{_libdir}/plymouth/details.so
%{_libdir}/plymouth/text.so
@ -551,7 +552,7 @@ fi
%files scripts
%dir %{_libexecdir}/plymouth
/sbin/plymouth-set-default-theme
%{_sbindir}/plymouth-set-default-theme
%{_libexecdir}/plymouth/plymouth-update-initrd
%if %{with x11_renderer}
@ -577,7 +578,7 @@ fi
%{_datadir}/plymouth/themes/spinfinity/*
%files plugin-space-flares
%{_libdir}/plymouth/space-flares.so
%{_libdir}/plymouth/*
%files theme-spinner
%dir %{_datadir}/plymouth/themes/spinner
@ -592,13 +593,13 @@ fi
%{_datadir}/plymouth/themes/tribar/*
%files plugin-two-step
%{_libdir}/plymouth/two-step.so
%{_libdir}/plymouth/*
%files plugin-tribar
%{_libdir}/plymouth/tribar.so
%{_libdir}/plymouth/*
%files plugin-script
%{_libdir}/plymouth/script.so
%{_libdir}/plymouth/*
%files theme-script
%dir %{_datadir}/plymouth/themes/script/