pool/plymouth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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).

OBS-URL: https://build.opensuse.org/request/show/832700
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=269
This commit is contained in:
Cliff Zhao 2020-09-07 09:08:38 +00:00 committed by Git OBS Bridge
parent 4e0545865e
commit be2eb18f69
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch
View File

@ -1,6 +1,6 @@
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 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/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-02 17:31:50.644198200 +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 @@ @@ -58,7 +58,12 @@
function get_default_theme () function get_default_theme ()
@ -15,7 +15,7 @@ diff -Nura plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-set-default-theme
if [ -z "$THEME_NAME" -o ! -r "${PLYMOUTH_DATADIR}/plymouth/themes/$THEME_NAME/$THEME_NAME.plymouth" ]; then 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) THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_POLICYDIR}/plymouthd.defaults)
fi fi
@@ -168,9 +173,15 @@ @@ -168,9 +173,16 @@
fi fi
if [ $DO_RESET -ne 0 ]; then if [ $DO_RESET -ne 0 ]; then
@ -26,7 +26,8 @@ diff -Nura plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-set-default-theme
+ sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf + sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
+ exit $? + exit $?
+ elif [ -f ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defauts ]; then + elif [ -f ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defauts ]; then
+ sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defauts + cp ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defauts ${PLYMOUTH_CONFDIR}/plymouthd.conf
+ sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
+ exit $? + exit $?
+ else + else
+ exit 0 + exit 0
@ -36,7 +37,7 @@ diff -Nura plymouth-0.9.5+git20190908+3abfab2/scripts/plymouth-set-default-theme
if [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then 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 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/src/Makefile.am 2019-09-09 15:31:37.000000000 +0800
+++ plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am 2020-09-02 17:32:57.830788642 +0800 +++ plymouth-0.9.5+git20190908+3abfab2_new/src/Makefile.am 2020-09-07 10:50:57.711594680 +0800
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
plymouthd_CFLAGS = $(PLYMOUTH_CFLAGS) \ plymouthd_CFLAGS = $(PLYMOUTH_CFLAGS) \

6
plymouth.changes
View File

@ -8,6 +8,12 @@ Sat Aug 29 06:13:50 UTC 2020 - Cliff Zhao <qzhao@suse.com>
config file. means this modification can close the leaps gap config file. means this modification can close the leaps gap
(jsc#SLE-11637). (jsc#SLE-11637).
-------------------------------------------------------------------
Sat Aug 28 16:11:25 UTC 2020 - Cliff Zhao <qzhao@suse.com>
- Update plymouth.spec: Dropping gdm transition because it has
alreay deprecated by upstream. Removing git build dependency.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 15 13:54:25 UTC 2020 - Cliff Zhao <qzhao@suse.com> Mon Jun 15 13:54:25 UTC 2020 - Cliff Zhao <qzhao@suse.com>

8
plymouth.spec
View File

@ -131,15 +131,13 @@ This package contains the libply library used by Plymouth.
%package branding-upstream %package branding-upstream
Summary: default configuration file and branding from the Plymouth upstream. Summary: default configuration file and branding from the Plymouth upstream.
Group: System/Base Group: System/Base
Requires: %{name} = %{version} Provides: %{name}-branding = %{version}-%{release}.
Conflicts: %{name}-branding Conflicts: %{name}-branding
BuildArch: noarch BuildArch: noarch
%description branding-upstream %description branding-upstream
This package contains the /usr/share/plymouthd.defaults which contains the basic This package contains the /usr/share/plymouthd.defaults which contains the basic
settings and branding from the upstream. the Plymouth in SLE and openSUSE will settings and branding from the upstream.
nolonger /etc/plymouth/plymouthd.conf at all, and it will read plymouthd.defaults
if /etc/plymouth/plymouthd.conf doesn't exist.
%package devel %package devel
Summary: Libraries and headers for writing Plymouth splash plugins Summary: Libraries and headers for writing Plymouth splash plugins
@ -534,7 +532,7 @@ fi
%dir %{_libdir}/plymouth %dir %{_libdir}/plymouth
%dir %{_libdir}/plymouth/renderers %dir %{_libdir}/plymouth/renderers
%dir %{_sysconfdir}/plymouth %dir %{_sysconfdir}/plymouth
%config(noreplace) %ghost %{_sysconfdir}/plymouth/plymouthd.conf %ghost %{_sysconfdir}/plymouth/plymouthd.conf
%{plymouthdaemon_execdir}/plymouthd %{plymouthdaemon_execdir}/plymouthd
%{plymouthclient_execdir}/plymouth %{plymouthclient_execdir}/plymouth
/bin/plymouth /bin/plymouth