Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2020-12-03 18:37:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth" Thu Dec 3 18:37:42 2020 rev:88 rq:851251 version:0.9.5+git20200921+20778f2 Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2020-11-02 09:40:31.089617109 +0100 +++ /work/SRC/openSUSE:Factory/.plymouth.new.5913/plymouth.changes 2020-12-03 18:37:45.137644257 +0100 @@ -1,0 +2,8 @@ +Thu Sat 21 14:26:51 UTC 2020 - Cliff Zhao <[email protected]> + +- 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. + +------------------------------------------------------------------- @@ -9,0 +18,5 @@ +Fri Oct 16 10:16:39 UTC 2020 - Ludwig Nussel <[email protected]> + +- Update plymouth.spec: prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- @@ -90,2 +103,2 @@ - /var during shutdown period(bsc#1105688, bsc#1129386, - bsc#1134660). + /var during shutdown period(bnc#1105688, bnc#1129386, + bnc#1134660, bnc#1166601, bnc#1171971). New: ---- plymouth-disable-fedora-logo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.wELirp/_old 2020-12-03 18:37:45.849645606 +0100 +++ /var/tmp/diff_new_pack.wELirp/_new 2020-12-03 18:37:45.853645613 +0100 @@ -47,6 +47,8 @@ Patch4: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch # PATCH-FIX-OPENSUSE plymouth-ignore-serial-console.patch [email protected] 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 [email protected] -- 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 [email protected] -- 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 [email protected] -- add ability to output text in initrd needed for encryption. @@ -389,9 +391,11 @@ %make_install rm -f %{buildroot}/%{_bindir}/rhgb-client +%if !0%{?usrmerged} #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) +%endif # Glow isn't quite ready for primetime rm -rf %{buildroot}%{_datadir}/plymouth/glow/ @@ -417,14 +421,14 @@ if [ ! -e /.buildenv ]; then [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration fi -[ -x /bin/systemctl ] && /bin/systemctl daemon-reload >/dev/null 2>&1 || : +%service_add_post %postun %{?regenerate_initrd_post} +%service_del_postun if [ $1 -eq 0 ]; then rm -f %{_libdir}/plymouth/default.so rm -f /boot/initrd-plymouth.img - [ -x /bin/systemctl ] && /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi %posttrans @@ -519,7 +523,9 @@ /etc/logrotate.d/bootlog %{plymouthdaemon_execdir}/plymouthd %{plymouthclient_execdir}/plymouth +%if !0%{?usrmerged} /bin/plymouth +%endif %{_libdir}/plymouth/details.so %{_libdir}/plymouth/text.so %{_libdir}/plymouth/renderers/drm* @@ -599,7 +605,6 @@ %{_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 ++++++ plymouth-disable-fedora-logo.patch ++++++ 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 _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
