From b2c453b5b68598d5a72088fd1cd80d96c4fcfe664dffbe7f7d358554f0f24ce7 Mon Sep 17 00:00:00 2001
From: Cliff Zhao <qzhao@suse.com>
Date: Wed, 29 Nov 2017 10:57:58 +0000
Subject: [PATCH 1/2] Accepting request 546369 from
 home:qzhao:branches:Base:System

Drop stop-graphical.patch: There are no conflicting these days, obsolete this patch to enable auto switch to TTY when display server not exist (boo#1066510).

OBS-URL: https://build.opensuse.org/request/show/546369
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=184
---
 _service             | 14 --------------
 _servicedata         |  4 ----
 plymouth.changes     |  7 +++++++
 plymouth.spec        |  3 ---
 stop-graphical.patch | 24 ------------------------
 5 files changed, 7 insertions(+), 45 deletions(-)
 delete mode 100644 _service
 delete mode 100644 _servicedata
 delete mode 100644 stop-graphical.patch

diff --git a/_service b/_service
deleted file mode 100644
index 1cfc5b1..0000000
--- a/_service
+++ /dev/null
@@ -1,14 +0,0 @@
-<services>
-  <service mode="disabled" name="tar_scm">
-    <param name="url">git://anongit.freedesktop.org/plymouth</param>
-    <param name="scm">git</param>
-    <param name="changesgenerate">enable</param>
-    <param name="filename">plymouth</param>
-    <param name="versionformat">0.9.2+git%cd.%h</param>
-  </service>
-  <service mode="disabled" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service mode="disabled" name="set_version"/>
-</services>
diff --git a/_servicedata b/_servicedata
deleted file mode 100644
index 7074e57..0000000
--- a/_servicedata
+++ /dev/null
@@ -1,4 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-                <param name="url">git://anongit.freedesktop.org/plymouth</param>
-              <param name="changesrevision">6fd5c6b260b89604f2ff7d65a4f1a011db23a726</param></service></servicedata>
diff --git a/plymouth.changes b/plymouth.changes
index 339fe67..2828f0d 100644
--- a/plymouth.changes
+++ b/plymouth.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov 29 07:59:40 UTC 2017 - qzhao@suse.com
+
+- Drop stop-graphical.patch: There are no conflicting these days, 
+  obsolete this patch to enable auto switch to TTY when display 
+  server not exist (boo#1066510).
+
 -------------------------------------------------------------------
 Wed Jun 14 06:16:48 UTC 2017 - qzhao@suse.com
 
diff --git a/plymouth.spec b/plymouth.spec
index 5a59f82..d574e77 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -32,8 +32,6 @@ Source0:        %{name}-%{version}.tar.xz
 Source1:        boot-duration
 # PATCH-OPENSUSE -- Handle correctly multiple displays with different sizes
 Patch3:         plymouth-fix-window-size
-# PATCH-OPENSUSE -- Ensure graphical.target is conflicting with plymouth-wait-quit.service
-Patch4:         stop-graphical.patch
 # PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin
 Patch9:         plymouth-dracut-path.patch
 Patch10:        0001-Some-greenish-openSUSE-colors.patch
@@ -337,7 +335,6 @@ plugin.
 %prep
 %setup -q
 %patch3 -p1
-%patch4 -p1
 %patch9
 %patch10 -p1
 %patch16 -p1
diff --git a/stop-graphical.patch b/stop-graphical.patch
deleted file mode 100644
index 3b03097..0000000
--- a/stop-graphical.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: plymouth-0.9.2/systemd-units/plymouth-quit-wait.service.in
-===================================================================
---- plymouth-0.9.2.orig/systemd-units/plymouth-quit-wait.service.in
-+++ plymouth-0.9.2/systemd-units/plymouth-quit-wait.service.in
-@@ -1,6 +1,7 @@
- [Unit]
- Description=Hold until boot process finishes up
- After=rc-local.service plymouth-start.service systemd-user-sessions.service
-+Conflicts=graphical.target
- 
- [Service]
- ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth --wait
-Index: plymouth-0.9.2/systemd-units/plymouth-quit.service.in
-===================================================================
---- plymouth-0.9.2.orig/systemd-units/plymouth-quit.service.in
-+++ plymouth-0.9.2/systemd-units/plymouth-quit.service.in
-@@ -1,6 +1,7 @@
- [Unit]
- Description=Terminate Plymouth Boot Screen
- After=rc-local.service plymouth-start.service systemd-user-sessions.service
-+Conflicts=graphical.target
- 
- [Service]
- ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit

From e06388502cb48163534ccabe06aa67189a95f0f9826576648717e578ee3981ef Mon Sep 17 00:00:00 2001
From: Cliff Zhao <qzhao@suse.com>
Date: Mon, 4 Dec 2017 09:25:46 +0000
Subject: [PATCH 2/2] Accepting request 548020 from
 home:qzhao:branches:Base:System

Drop stop-graphical.patch: There are no conflicting these days, obsolete this patch to enable auto switch to TTY when display server not exist (boo#1066510).

OBS-URL: https://build.opensuse.org/request/show/548020
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=185
---
 _service     | 14 ++++++++++++++
 _servicedata |  4 ++++
 2 files changed, 18 insertions(+)
 create mode 100644 _service
 create mode 100644 _servicedata

diff --git a/_service b/_service
new file mode 100644
index 0000000..1cfc5b1
--- /dev/null
+++ b/_service
@@ -0,0 +1,14 @@
+<services>
+  <service mode="disabled" name="tar_scm">
+    <param name="url">git://anongit.freedesktop.org/plymouth</param>
+    <param name="scm">git</param>
+    <param name="changesgenerate">enable</param>
+    <param name="filename">plymouth</param>
+    <param name="versionformat">0.9.2+git%cd.%h</param>
+  </service>
+  <service mode="disabled" name="recompress">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service mode="disabled" name="set_version"/>
+</services>
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..7074e57
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">git://anongit.freedesktop.org/plymouth</param>
+              <param name="changesrevision">6fd5c6b260b89604f2ff7d65a4f1a011db23a726</param></service></servicedata>