Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plymouth for openSUSE:Factory
checked in at 2022-01-29 21:01:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plymouth (Old)
and /work/SRC/openSUSE:Factory/.plymouth.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth"
Sat Jan 29 21:01:15 2022 rev:96 rq:949492 version:0.9.5~git20210406.e554475
Changes:
--------
--- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2021-09-07
21:13:40.932741711 +0200
+++ /work/SRC/openSUSE:Factory/.plymouth.new.1898/plymouth.changes
2022-01-29 21:01:51.650763273 +0100
@@ -1,0 +2,29 @@
+Thu Jan 13 15:14:28 UTC 2022 - Cliff Zhao <qz...@suse.com>
+
+- 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.
+
+-------------------------------------------------------------------
Old:
----
plymouth-correct-runtime-dir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth.spec ++++++
--- /var/tmp/diff_new_pack.P2dfPB/_old 2022-01-29 21:01:52.310758836 +0100
+++ /var/tmp/diff_new_pack.P2dfPB/_new 2022-01-29 21:01:52.318758782 +0100
@@ -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 @@
Patch0: plymouth-dracut-path.patch
# PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148
fcro...@suse.com -- To use suse colors in tribar.
Patch1: plymouth-some-greenish-openSUSE-colors.patch
-# PATCH-FIX-OPENSUSE plymouth-correct-runtime-dir.patch tittiatc...@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 idoen...@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
qz...@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 qz...@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 fv...@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 qz...@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 fv...@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
fv...@suse.com -- add ability to output text in initrd needed for encryption.
@@ -98,16 +96,24 @@
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 @@
%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 @@
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 @@
--disable-static \
--disable-upstart-monitoring \
--disable-tests \
- --disable-libkms \
%if %{without x11_renderer}
--disable-gtk \
%endif
@@ -381,6 +379,7 @@
--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 @@
%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 @@
%{_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 @@
%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 plugin-script
+%{_libdir}/plymouth/script.so
+
+%files plugin-space-flares
+%{_libdir}/plymouth/space-flares.so
+
+%files plugin-tribar
+%{_libdir}/plymouth/tribar.so
+
+%files plugin-two-step
+%{_libdir}/plymouth/two-step.so
+
+%files theme-bgrt
+%dir %{_datadir}/plymouth/themes/bgrt
+%{_datadir}/plymouth/themes/bgrt/*
%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
+%{_datadir}/plymouth/themes/fade-in/*
%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
+%{_datadir}/plymouth/themes/spinfinity/*
-%files plugin-space-flares
-%{_libdir}/plymouth/space-flares.so
+%files theme-script
+%dir %{_datadir}/plymouth/themes/script/
+%{_datadir}/plymouth/themes/script/*
%files theme-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/*.png
-%{_datadir}/plymouth/themes/solar/solar.plymouth
+%{_datadir}/plymouth/themes/solar/*
%files theme-tribar
%dir %{_datadir}/plymouth/themes/tribar
-%{_datadir}/plymouth/themes/tribar/*.*
-
-%files plugin-two-step
-%{_libdir}/plymouth/two-step.so
-
-%files plugin-tribar
-%{_libdir}/plymouth/tribar.so
-
-%files plugin-script
-%{_libdir}/plymouth/script.so
-
-%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
-
-%files theme-bgrt
-%dir %{_datadir}/plymouth/themes/bgrt
-%{_datadir}/plymouth/themes/bgrt/*.*
+%{_datadir}/plymouth/themes/tribar/*
%changelog
