- restore suspend and resume splash modes for suspend-utils

- rel 6

diff --git a/plymouth-restore-suspend.patch b/plymouth-restore-suspend.patch
new file mode 100644 (file)
index 0000000..166ffce
--- /dev/null
+++ b/plymouth-restore-suspend.patch
@@ -0,0 +1,49 @@
+From 152304f3fd2ebd04ca6d49c62dce4ddd2269326a Mon Sep 17 00:00:00 2001
+From: Frederic Crozat <fcrozat@suse.com>
+Date: Fri, 20 Jul 2012 11:07:29 +0200
+Subject: [PATCH] Revert "libply: remove the unused SPLASH_MODE_SUSPEND and
+ SPLASH_MODE_RESUME"
+
+This reverts commit 02c596757753589f7e49d26eab2759d552f24671.
+
+Conflicts:
+       src/libply-splash-core/ply-boot-splash-plugin.h
+       src/plugins/splash/script/script-lib-plymouth.c
+---
+ src/libply-splash-core/ply-boot-splash-plugin.h |    2 ++
+ src/plugins/splash/script/script-lib-plymouth.c |    6 ++++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/src/libply-splash-core/ply-boot-splash-plugin.h b/src/libply-splash-core/ply-boot-splash-plugin.h
+index 2d73d66..1a67526 100644
+--- a/src/libply-splash-core/ply-boot-splash-plugin.h
++++ b/src/libply-splash-core/ply-boot-splash-plugin.h
+@@ -38,6 +38,8 @@ typedef enum
+ {
+   PLY_BOOT_SPLASH_MODE_BOOT_UP,
+   PLY_BOOT_SPLASH_MODE_SHUTDOWN,
++  PLY_BOOT_SPLASH_MODE_SUSPEND,
++  PLY_BOOT_SPLASH_MODE_RESUME,
+   PLY_BOOT_SPLASH_MODE_UPDATES,
+   PLY_BOOT_SPLASH_MODE_INVALID
+ } ply_boot_splash_mode_t;
+diff --git a/src/plugins/splash/script/script-lib-plymouth.c b/src/plugins/splash/script/script-lib-plymouth.c
+index 5c648a6..eb7791e 100644
+--- a/src/plugins/splash/script/script-lib-plymouth.c
++++ b/src/plugins/splash/script/script-lib-plymouth.c
+@@ -61,6 +61,12 @@ static script_return_t plymouth_get_mode (script_state_t *state,
+       case PLY_BOOT_SPLASH_MODE_SHUTDOWN:
+         obj = script_obj_new_string ("shutdown");
+         break;
++      case PLY_BOOT_SPLASH_MODE_SUSPEND:
++        obj = script_obj_new_string ("suspend");
++        break;
++      case PLY_BOOT_SPLASH_MODE_RESUME:
++        obj = script_obj_new_string ("resume");
++      break;
+       case PLY_BOOT_SPLASH_MODE_UPDATES:
+         obj = script_obj_new_string ("updates");
+         break;
+-- 
+1.7.10.4
+

diff --git a/plymouth.spec b/plymouth.spec
index 9c174bbd500c7e2d3bf5a3a87eda2a14f29960fc..5163948f952a6ea25ff3e019c18a595177b5737e 100644 (file)
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -14,7 +14,7 @@ Summary:      Graphical Boot Animation and Logger
 Summary(pl.UTF-8):     Graficzna animacja i logowanie startu systemu
 Name:          plymouth
 Version:       0.8.8
-Release:       5
+Release:       6
 License:       GPL v2+
 Group:         Base
 Source0:       http://www.freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -30,12 +30,14 @@ Source7:    systemd-ask-password-plymouth.path
 Source8:       systemd-ask-password-plymouth.service
 Patch0:                text-colors.patch
 Patch1:                path-udevadm.patch
+Patch2:                %{name}-restore-suspend.patch
 URL:           http://www.freedesktop.org/wiki/Software/Plymouth
 BuildRequires: cairo-devel
 BuildRequires: gtk+2-devel >= 2:2.12.0
 %if %{with drm_intel} ||  %{with drm_radeon} ||  %{with drm_nouveau} ||  %{with kms}
 BuildRequires: libdrm-devel
 %endif
+BuildRequires: xorg-lib-libpciaccess-devel
 BuildRequires: libpng-devel >= 2:1.2.16
 BuildRequires: pango-devel >= 1:1.21.0
 BuildRequires: pkgconfig
@@ -347,6 +349,7 @@ Odznacza się on małym kółkiem kręcącym się na ciemnym tle.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Change the default theme
 sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults