Accepting request 232715 from home:fcrozat:branches:Base:System

- Remove plymouth-restore-suspend.patch: suspend package is being
  dropped, no longer needs to provide this old API.
- Remove requires on suspend package.

OBS-URL: https://build.opensuse.org/request/show/232715
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=141

plymouth-restore-suspend.patch

@@ -1,49 +0,0 @@
-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
-

plymouth.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May  5 12:49:49 UTC 2014 - fcrozat@suse.com
+
+- Remove plymouth-restore-suspend.patch: suspend package is being
+  dropped, no longer needs to provide this old API.
+- Remove requires on suspend package.
+
 -------------------------------------------------------------------
 Thu Apr 17 12:56:23 UTC 2014 - idonmez@suse.com
 

plymouth.spec

@@ -34,8 +34,6 @@ Source1:        boot-duration
 Patch3:         plymouth-fix-window-size
 # PATCH-OPENSUSE -- Ensure graphical.target is conflicting with plymouth-wait-quit.service
 Patch4:         stop-graphical.patch
-# PATCH-OPENSUSE -- Restore suspend / resume state (needed for suspend package)
-Patch5:         plymouth-restore-suspend.patch
 # PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin
 Patch9:         plymouth-dracut-path.patch
 Patch10:        0001-Some-greenish-openSUSE-colors.patch
@@ -56,9 +54,6 @@ BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(systemd) >= 186
 Requires:       %{name}-branding
 Requires:       gnu-unifont-bitmap-fonts
-%ifarch %ix86 x86_64 ppc ppc64 ppc64le
-Requires:       suspend >= 0.80.20100129.1
-%endif
 Requires:       systemd >= 186
 Requires(post): plymouth-scripts = %{version}
 BuildRequires:  suse-module-tools
@@ -327,9 +322,6 @@ plugin.
 %setup -q
 %patch3 -p1
 %patch4 -p1
-%ifarch %ix86 x86_64 ppc ppc64 ppc64le
-%patch5 -p1
-%endif
 %patch9 -p0
 %patch10 -p1
 %patch16 -p1