Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2020-09-24 16:11:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth" Thu Sep 24 16:11:50 2020 rev:84 rq:832702 version:0.9.5+git20190908+3abfab2 Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2020-06-22 17:42:37.409215172 +0200 +++ /work/SRC/openSUSE:Factory/.plymouth.new.4249/plymouth.changes 2020-09-24 16:11:53.748757700 +0200 @@ -1,0 +2,16 @@ +Sat Aug 29 06:13:50 UTC 2020 - Cliff Zhao <qz...@suse.com> + +- Add plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch: + plymouth will use plymouthd.defaults instead of plymouth.conf and + packge plymouthd.defaults in a seperet RPM. this can avoid change + SUSE or openSUSE branding section with is_opensuse macro in the + config file. means this modification can close the leaps gap + (jsc#SLE-11637). + +------------------------------------------------------------------- +Sat Aug 28 16:11:25 UTC 2020 - Cliff Zhao <qz...@suse.com> + +- Update plymouth.spec: Dropping gdm transition because it has + alreay deprecated by upstream. Removing git build dependency. + +------------------------------------------------------------------- New: ---- plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.WgsU4k/_old 2020-09-24 16:11:54.816758768 +0200 +++ /var/tmp/diff_new_pack.WgsU4k/_new 2020-09-24 16:11:54.820758771 +0200 @@ -33,7 +33,6 @@ License: GPL-2.0-or-later Group: System/Base URL: http://www.freedesktop.org/wiki/Software/Plymouth - Source0: %{name}-%{version}.tar.xz Source1: boot-duration # PATCH-FIX-OPENSUSE plymouth-dracut-path.patch tittiatc...@gmail.com -- Prefix is /usr/sbin and /usr/bin @@ -46,18 +45,17 @@ Patch3: plymouth-manpages.patch # PATCH-FIX-OPENSUSE plymouth-avoid-umount-hanging-shutdown.patch bnc#1105688, bnc#1129386, bnc#1134660 qz...@opensuse.org -- Drop grantpt() to avoid system failed to unmount /var during shutdown. Patch4: plymouth-avoid-umount-hanging-shutdown.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. +Patch5: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.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. Patch1001: 0002-Install-label-ft-plugin-into-initrd-if-available.patch # PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fv...@suse.com -- add ability to output text in initrd needed for encryption. Patch1002: 0003-fix_null_deref.patch - BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc -BuildRequires: git BuildRequires: kernel-headers BuildRequires: libtool BuildRequires: libxslt @@ -78,7 +76,6 @@ %if %{with x11_renderer} BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 %endif - Recommends: %{name}-lang Requires: %{name}-branding Requires: gnu-unifont-bitmap-fonts @@ -131,6 +128,17 @@ %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 +Provides: %{name}-branding = %{version}-%{release}. +Conflicts: %{name}-branding +BuildArch: noarch + +%description branding-upstream +This package contains the /usr/share/plymouthd.defaults which contains the basic +settings and branding from the upstream. + %package devel Summary: Libraries and headers for writing Plymouth splash plugins Group: Development/Libraries/C and C++ @@ -364,16 +372,12 @@ Plymouth. %prep -%autosetup -S git -autoreconf -ivf -Wno-portabilty +%setup -q +%autopatch -p1 +autoreconf -ivf + # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c -# 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 %configure \ @@ -381,7 +385,6 @@ --enable-tracing \ --disable-silent-rules \ --disable-static \ - --disable-gdm-transition \ --disable-upstart-monitoring \ --disable-tests \ --disable-libkms \ @@ -421,7 +424,10 @@ touch %{buildroot}%{_localstatedir}/spool/plymouth/boot.log 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 + +# We will nolonger ship plymouthd.conf, Plymouthd will read /usr/share/plymouth/plymouthd.defaults if /etc/plymouth/plymouthd.conf doesn't exist(jsc#SLE-11637). +rm -f %{buildroot}%{_sysconfdir}/plymouth/plymouthd.conf +rm -f %{buildroot}%{_datadir}/plymouth/plymouthd.conf %post %{?regenerate_initrd_post} @@ -526,7 +532,7 @@ %dir %{_libdir}/plymouth %dir %{_libdir}/plymouth/renderers %dir %{_sysconfdir}/plymouth -%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf +%ghost %{_sysconfdir}/plymouth/plymouthd.conf %{plymouthdaemon_execdir}/plymouthd %{plymouthclient_execdir}/plymouth /bin/plymouth @@ -537,7 +543,6 @@ %{_datadir}/plymouth/default-boot-duration %{_datadir}/plymouth/themes/details/details.plymouth %{_datadir}/plymouth/themes/text/text.plymouth -%{_datadir}/plymouth/plymouthd.defaults %{_datadir}/plymouth/bizcom.png %ghost /run/plymouth %{_localstatedir}/spool/plymouth @@ -547,6 +552,9 @@ %ghost %{_localstatedir}/log/boot.log /usr/share/locale/ +%files branding-upstream +%{_datadir}/plymouth/plymouthd.defaults + %files dracut %{_libexecdir}/plymouth/plymouth-populate-initrd %{_libexecdir}/plymouth/plymouth-generate-initrd ++++++ plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch ++++++ diff -Nura plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-set-default-theme.in plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-set-default-theme.in --- plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-set-default-theme.in 2019-09-09 15:31:37.000000000 +0800 +++ plymouth-0.9.5+git20190908+3abfab2_new/scripts/plymouth-set-default-theme.in 2020-09-07 16:09:51.568487811 +0800 @@ -58,7 +58,12 @@ function get_default_theme () { - THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_CONFDIR}/plymouthd.conf) + if [ -f /etc/plymouth/plymouthd.conf ]; then + THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_CONFDIR}/plymouthd.conf) + elif [ -f /usr/share/plymouth/plymouthd.defaults ]; then + THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defaults) + fi + if [ -z "$THEME_NAME" -o ! -r "${PLYMOUTH_DATADIR}/plymouth/themes/$THEME_NAME/$THEME_NAME.plymouth" ]; then THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_POLICYDIR}/plymouthd.defaults) fi @@ -168,9 +173,16 @@ fi if [ $DO_RESET -ne 0 ]; then - [ -f ${PLYMOUTH_CONFDIR}/plymouthd.conf ] || exit 0 - sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf - exit $? + if [ -f ${PLYMOUTH_CONFDIR}/plymouthd.conf ]; then + sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf + exit $? + elif [ -f ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defauts ]; then + cp ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defauts ${PLYMOUTH_CONFDIR}/plymouthd.conf + sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf + exit $? + else + exit 0 + fi fi if [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then diff -Nura plymouth-0.9.5+git20190908+3abfab2/src/Makefile.am plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am --- plymouth-0.9.5+git20190908+3abfab2/src/Makefile.am 2019-09-09 15:31:37.000000000 +0800 +++ plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am 2020-09-07 10:50:57.711594680 +0800 @@ -16,6 +16,7 @@ plymouthd_CFLAGS = $(PLYMOUTH_CFLAGS) \ -rdynamic \ + -DPLYMOUTH_DATADIR=\"$(PLYMOUTH_DATAPATH)\" \ -DPLYMOUTH_PLUGIN_PATH=\"$(PLYMOUTH_PLUGIN_PATH)\" \ -DPLYMOUTH_THEME_PATH=\"$(PLYMOUTH_THEME_PATH)/\" \ -DPLYMOUTH_POLICY_DIR=\"$(PLYMOUTH_POLICY_DIR)/\" \
