diff --git a/plymouth-correct-runtime-dir.patch b/plymouth-correct-runtime-dir.patch deleted file mode 100644 index c7a72dd..0000000 --- a/plymouth-correct-runtime-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nura plymouth-0.9.5+git20200921+20778f2/configure.ac plymouth-0.9.5+git20200921+20778f2_new/configure.ac ---- plymouth-0.9.5+git20200921+20778f2/configure.ac 2020-07-18 15:27:12.000000000 +0800 -+++ plymouth-0.9.5+git20200921+20778f2_new/configure.ac 2020-10-02 21:41:46.998308963 +0800 -@@ -154,7 +154,7 @@ - plymouthclientdir=$bindir - plymouthdaemondir=$sbindir - if (test -z "${plymouthruntimedir}"); then -- plymouthruntimedir=$localstatedir/run/plymouth -+ plymouthruntimedir=/run/plymouth - fi - fi - AC_SUBST(plymouthclientdir) diff --git a/plymouth.changes b/plymouth.changes index 65709aa..8e47c7f 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Thu Jan 13 15:14:28 UTC 2022 - Cliff Zhao + +- Update SPEC file: + Remove usermerged macro and script: + 1, currently, it blocks the building in SLE-15-SP4; + 2, plymouth already build with "without-system-root-install", + make all binary install to /usr/bin and /usr/sbin; which + fit for /user merge target. + 3, plymouth is not launched by user. and all system intergration + point are called from /usr. + 4, So no change need to do, everything already works. + Remove rm rhgb-client: + plymouth already build with "without-rhgb-compat-link", + rhgb doesn't generated from beginning. + Remove "disable-libkms": + SUSE support kms and drm very well now, plymouth works + fine with them. +- Remove plymouth-correct-runtime-dir.patch: + Use upstream build param "with-runtimedir=/run" to instead. +- Change plymouth-dracut build arch to noarch: + It only contain a script. + Change libply, libply-boot-client, libply-splash-core, + libply-splash-graphics group from Development/Libraries/C and + C++ to System/Libraries: + They are plymouth and plymouthd runtime library, which install + together with plymouth. +- Resort rpm file list. + ------------------------------------------------------------------- Tue Aug 31 14:13:20 UTC 2021 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index cfb80c0..96b5aef 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -1,7 +1,7 @@ # # spec file for package plymouth # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,18 +35,16 @@ Source1: boot-duration 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 -# PATCH-FIX-OPENSUSE plymouth-correct-runtime-dir.patch tittiatcoke@gmail.com -- Make sure the runtime directory is /run and not /var/run -Patch2: plymouth-correct-runtime-dir.patch # PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation -Patch3: plymouth-manpages.patch +Patch2: plymouth-manpages.patch # PATCH-FIX-SLE plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch qzhao@suse.com jsc#SLE-11637 -- plymouth will use plymouthd.defaults instead of plymouth.conf to close the leap gap. -Patch4: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch +Patch3: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.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 +Patch4: plymouth-disable-fedora-logo.patch # PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 boo#1172028 bsc#1181913 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. -Patch7: plymouth-only_use_fb_for_cirrus_bochs.patch +Patch5: plymouth-only_use_fb_for_cirrus_bochs.patch # PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 qzhao@suse.com -- Keep the plymouth-start.service KillMode=none. -Patch8: plymouth-keep-KillMode-none.patch +Patch6: plymouth-keep-KillMode-none.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. @@ -98,16 +96,24 @@ messages are instead redirected to a log file for viewing after boot. %lang_package +%package -n libply%{soversion} +Summary: Plymouth core library +Group: System/Libraries +Requires: libply-boot-client%{soversion} = %{version} + +%description -n libply%{soversion} +This package contains the libply library used by Plymouth. + %package -n libply-boot-client%{soversion} Summary: Plymouth core library -Group: Development/Libraries/C and C++ +Group: System/Libraries %description -n libply-boot-client%{soversion} This package contains the libply-boot-client library used by Plymouth. %package -n libply-splash-core%{soversion} Summary: Plymouth core library -Group: Development/Libraries/C and C++ +Group: System/Libraries %description -n libply-splash-core%{soversion} This package contains the libply-splash-core library @@ -115,21 +121,13 @@ used by graphical Plymouth splashes. %package -n libply-splash-graphics%{soversion} Summary: Plymouth graphics libraries -Group: Development/Libraries/C and C++ +Group: System/Libraries BuildRequires: libpng-devel %description -n libply-splash-graphics%{soversion} This package contains the libply-splash-graphics library used by graphical Plymouth splashes. -%package -n libply%{soversion} -Summary: Plymouth core library -Group: Development/Libraries/C and C++ -Requires: libply-boot-client%{soversion} = %{version} - -%description -n libply%{soversion} -This package contains the libply library used by Plymouth. - %package branding-upstream Summary: default configuration file and branding from the Plymouth upstream. Group: System/Base @@ -163,6 +161,7 @@ Summary: Plymouth related utilities for dracut Group: System/Base Requires: %{name} = %{version} Supplements: packageand(plymouth:dracut) +BuildArch: noarch %description dracut This package contains utilities that integrate dracut with Plymouth @@ -371,7 +370,6 @@ autoreconf -ivf --disable-static \ --disable-upstart-monitoring \ --disable-tests \ - --disable-libkms \ %if %{without x11_renderer} --disable-gtk \ %endif @@ -381,6 +379,7 @@ autoreconf -ivf --with-background-start-color-stop=0x1A3D1F \ --with-background-end-color-stop=0x4EA65C \ --with-background-color=0x3391cd \ + --with-runtimedir=/run \ --without-rhgb-compat-link \ --without-system-root-install @@ -388,20 +387,11 @@ make %{?_smp_mflags} %install %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/ rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/ -rm -f %{buildroot}%{_libdir}/plymouth/glow.so -find %{buildroot} -type f -name "*.la" -delete -print +find %{buildroot} -type f -name "*.la" -delete mkdir -p %{buildroot}%{_localstatedir}/lib/plymouth mkdir -p %{buildroot}/run/plymouth @@ -570,6 +560,9 @@ fi %{_libdir}/pkgconfig/ply-boot-client.pc %{_includedir}/plymouth-1 +%files -n libply%{soversion} +%{_libdir}/libply.so.%{soversion}* + %files -n libply-boot-client%{soversion} %{_libdir}/libply-boot-client.so.%{soversion}* @@ -579,82 +572,63 @@ fi %files -n libply-splash-graphics%{soversion} %{_libdir}/libply-splash-graphics.so.%{soversion}* -%files -n libply%{soversion} -%{_libdir}/libply.so.%{soversion}* - %files scripts %dir %{_libexecdir}/plymouth -%{_sbindir}/plymouth-set-default-theme %{_libexecdir}/plymouth/plymouth-update-initrd +%{_sbindir}/plymouth-set-default-theme %if %{with x11_renderer} %files x11-renderer %{_libdir}/plymouth/renderers/x11* %endif +%files plugin-fade-throbber +%{_libdir}/plymouth/fade-throbber.so + %files plugin-label %{_libdir}/plymouth/label.so %files plugin-label-ft %{_libdir}/plymouth/label-ft.so -%files plugin-fade-throbber -%{_libdir}/plymouth/fade-throbber.so - -%files theme-fade-in -%dir %{_datadir}/plymouth/themes/fade-in -%{_datadir}/plymouth/themes/fade-in/bullet.png -%{_datadir}/plymouth/themes/fade-in/entry.png -%{_datadir}/plymouth/themes/fade-in/lock.png -%{_datadir}/plymouth/themes/fade-in/star.png -%{_datadir}/plymouth/themes/fade-in/fade-in.plymouth - -%files theme-spinfinity -%dir %{_datadir}/plymouth/themes/spinfinity -%{_datadir}/plymouth/themes/spinfinity/box.png -%{_datadir}/plymouth/themes/spinfinity/bullet.png -%{_datadir}/plymouth/themes/spinfinity/entry.png -%{_datadir}/plymouth/themes/spinfinity/lock.png -%{_datadir}/plymouth/themes/spinfinity/capslock.png -%{_datadir}/plymouth/themes/spinfinity/keyboard.png -%{_datadir}/plymouth/themes/spinfinity/keymap-render.png -%{_datadir}/plymouth/themes/spinfinity/animation-0001.png -%{_datadir}/plymouth/themes/spinfinity/throbber-[0-3][0-9].png -%{_datadir}/plymouth/themes/spinfinity/spinfinity.plymouth +%files plugin-script +%{_libdir}/plymouth/script.so %files plugin-space-flares %{_libdir}/plymouth/space-flares.so -%files theme-spinner -%dir %{_datadir}/plymouth/themes/spinner -%{_datadir}/plymouth/themes/spinner/*.* - -%files theme-solar -%dir %{_datadir}/plymouth/themes/solar -%{_datadir}/plymouth/themes/solar/*.png -%{_datadir}/plymouth/themes/solar/solar.plymouth - -%files theme-tribar -%dir %{_datadir}/plymouth/themes/tribar -%{_datadir}/plymouth/themes/tribar/*.* +%files plugin-tribar +%{_libdir}/plymouth/tribar.so %files plugin-two-step %{_libdir}/plymouth/two-step.so -%files plugin-tribar -%{_libdir}/plymouth/tribar.so +%files theme-bgrt +%dir %{_datadir}/plymouth/themes/bgrt +%{_datadir}/plymouth/themes/bgrt/* -%files plugin-script -%{_libdir}/plymouth/script.so +%files theme-fade-in +%dir %{_datadir}/plymouth/themes/fade-in +%{_datadir}/plymouth/themes/fade-in/* + +%files theme-spinfinity +%dir %{_datadir}/plymouth/themes/spinfinity +%{_datadir}/plymouth/themes/spinfinity/* %files theme-script %dir %{_datadir}/plymouth/themes/script/ -%{_datadir}/plymouth/themes/script/*.png -%{_datadir}/plymouth/themes/script/script.script -%{_datadir}/plymouth/themes/script/script.plymouth +%{_datadir}/plymouth/themes/script/* -%files theme-bgrt -%dir %{_datadir}/plymouth/themes/bgrt -%{_datadir}/plymouth/themes/bgrt/*.* +%files theme-spinner +%dir %{_datadir}/plymouth/themes/spinner +%{_datadir}/plymouth/themes/spinner/* + +%files theme-solar +%dir %{_datadir}/plymouth/themes/solar +%{_datadir}/plymouth/themes/solar/* + +%files theme-tribar +%dir %{_datadir}/plymouth/themes/tribar +%{_datadir}/plymouth/themes/tribar/* %changelog