From 624cca758514a985260ec2ac69a35c02a18c0dc88e9322df7873a43b26fd567e Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 4 Jun 2012 18:36:53 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=46 --- plymouth.changes | 7 +++++++ plymouth.spec | 18 +----------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 5d1826a..033cefd 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 4 18:34:08 UTC 2012 - tittiatcoke@gmail.com + +- Ensure that the openSUSE theme is default. +- Remove unnecessary changes to the kernel options. Plymouth also + accepts splash=silent. + ------------------------------------------------------------------- Wed May 30 16:41:02 UTC 2012 - vuntz@opensuse.org diff --git a/plymouth.spec b/plymouth.spec index e47068b..f537edf 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -324,7 +324,7 @@ plugin. sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c # Change the default theme -sed -i -e 's/fade-in/solar/g' src/plymouthd.defaults +sed -i -e 's/fade-in/openSUSE/g' src/plymouthd.defaults %build autoreconf -fiv @@ -387,28 +387,12 @@ rm -rf %{buildroot} if [ ! -e /.buildenv ]; then [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration %{_libexecdir}/plymouth/plymouth-update-initrd - if [ $1 -eq 1 ]; then - if [ -f %{_sysconfdir}/default/grub ]; then - sed -i 's|splash=silent|splash|g' %{_sysconfdir}/default/grub - grub2-mkconfig -o /boot/grub2/grub.cfg - fi - if [ -f /boot/grub/menu.lst ]; then - sed -i 's|splash=silent|splash|g' /boot/grub/menu.lst - fi - fi fi %postun if [ $1 -eq 0 ]; then rm -f %{_libdir}/plymouth/default.so rm -f /boot/initrd-plymouth.img - if [ -f %{_sysconfdir}/default/grub ]; then - sed -i 's|splash|splash=silent|g' %{_sysconfdir}/default/grub - grub2-mkconfig -o /boot/grub2/grub.cfg - fi - if [ -f /boot/grub/menu.lst ]; then - sed -i 's|splash|splash=silent|g' /boot/grub/menu.lst - fi fi %post scripts -p /sbin/mkinitrd_setup From 16ab2a452a10ef4553f5f21c42a01b63af3ca6cfd22c8c5e65db3b9fc823b68f Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 4 Jun 2012 19:00:06 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=47 --- plymouth.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/plymouth.spec b/plymouth.spec index f537edf..4ceee17 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -369,6 +369,7 @@ mkdir -p %{buildroot}%{_localstatedir}/run/plymouth cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_datadir}/plymouth/default-boot-duration cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_localstatedir}/lib/plymouth cp %{SOURCE2} %{buildroot}%{_datadir}/plymouth/logo.png +cp $RPM_SOURCE_DIR/%{_datadir}/plymouth/plymouthd.defaults $RPM_SOURCE_DIR/%{_sysconfdir}/plymouth/plymouth.conf mkdir -p %{buildroot}/lib/mkinitrd/scripts install -t %{buildroot}/lib/mkinitrd/scripts \ From f57372f23df7d79a5bf9f24621894409e047537541d3417f53f33d6788e3e4a8 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 4 Jun 2012 19:13:15 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=48 --- plymouth.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plymouth.spec b/plymouth.spec index 4ceee17..a575374 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -369,7 +369,7 @@ mkdir -p %{buildroot}%{_localstatedir}/run/plymouth cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_datadir}/plymouth/default-boot-duration cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_localstatedir}/lib/plymouth cp %{SOURCE2} %{buildroot}%{_datadir}/plymouth/logo.png -cp $RPM_SOURCE_DIR/%{_datadir}/plymouth/plymouthd.defaults $RPM_SOURCE_DIR/%{_sysconfdir}/plymouth/plymouth.conf +cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouth.conf mkdir -p %{buildroot}/lib/mkinitrd/scripts install -t %{buildroot}/lib/mkinitrd/scripts \ From 6cc900971c092acfcb0d64fa68c4cedab7c0db9e9874f791a5877ca5c4898cf0 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 4 Jun 2012 19:18:20 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=49 --- plymouth.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/plymouth.spec b/plymouth.spec index a575374..0f9650f 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -486,6 +486,7 @@ fi %dir %{_libdir}/plymouth %dir %{_libdir}/plymouth/renderers %dir %{_sysconfdir}/plymouth +%{_sysconfdir}/plymouth/plymouth.conf %{plymouthdaemon_execdir}/plymouthd %{plymouthclient_execdir}/plymouth /bin/plymouth From eba6ab1203da9225ec9ec527de007120cf5d2970beeb49c8a1dd047f69542dc9 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 4 Jun 2012 19:20:32 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=50 --- plymouth.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plymouth.changes b/plymouth.changes index 033cefd..01acbae 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Jun 4 18:34:08 UTC 2012 - tittiatcoke@gmail.com -- Ensure that the openSUSE theme is default. +- Ensure that the openSUSE theme is default. (bnc#765277) - Remove unnecessary changes to the kernel options. Plymouth also accepts splash=silent.