Accepting request 627433 from Base:System

OBS-URL: https://build.opensuse.org/request/show/627433
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=60

plymouth-fix-window-size

@@ -1,38 +0,0 @@
-From: Jeff Mahoney <jeffm@suse.com>
-Subject: plymouth/script: Fix window size with multiple heads
-
- Plymouth "zooms" in on smaller displays when multiple displays are used,
- but the script splash plugin defines the window size as the smallest
- of the displays. When using a sprite as a background image, the wrong
- size is used which leaves large chunks of the screen unused.
-
- This patch uses the largest display as the window size, which allows
- it to be appopriately cropped on smaller displays.
-
-Signed-off-by: Jeff Mahoney <jeffm@suse.com>
----
- src/plugins/splash/script/script-lib-sprite.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: plymouth-0.9.2/src/plugins/splash/script/script-lib-sprite.c
-===================================================================
---- plymouth-0.9.2.orig/src/plugins/splash/script/script-lib-sprite.c
-+++ plymouth-0.9.2/src/plugins/splash/script/script-lib-sprite.c
-@@ -231,7 +231,7 @@ static script_return_t sprite_window_get
-                 if (width == 0)
-                         width = ply_pixel_display_get_width (display->pixel_display);
-                 else
--                        width = MIN (width, ply_pixel_display_get_width (display->pixel_display));
-+                        width = MAX (width, ply_pixel_display_get_width (display->pixel_display));
-         }
-         return script_return_obj (script_obj_new_number (width));
- }
-@@ -269,7 +269,7 @@ static script_return_t sprite_window_get
-                 if (height == 0)
-                         height = ply_pixel_display_get_height (display->pixel_display);
-                 else
--                        height = MIN (height, ply_pixel_display_get_height (display->pixel_display));
-+                        height = MAX (height, ply_pixel_display_get_height (display->pixel_display));
-         }
-         return script_return_obj (script_obj_new_number (height));
- }

plymouth.changes

@@ -1,10 +1,16 @@
+-------------------------------------------------------------------
+Sat Aug  4 06:15:14 UTC 2018 - qzhao@suse.com
+
+- Drop plymouth-fix-window-size: The use of the smallest screen 
+  size is deliberate (boo#804607 bsc#894051).
+
 -------------------------------------------------------------------
 Wed Apr 11 12:44:36 UTC 2018 - oholecek@suse.com
 
 - Modify 0001-Add-label-ft-plugin.patch to fix problems with
   multiline text (bsc#1083695)
   * to prevent infinite loop newline characters need to be skipped
-- Use %license instead of %doc [bsc#1082318]
+- Use %license instead of %doc (bsc#1082318)
 
 -------------------------------------------------------------------
 Sat Jan 13 21:20:16 UTC 2018 - zaitor@opensuse.org
@@ -239,13 +245,13 @@ Mon Jul 28 16:10:49 CEST 2014 - fcrozat@suse.com
 
 - Add
   0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch:
-  fix incorrect UTF-8 code used for square [bnc#886148].
+  fix incorrect UTF-8 code used for square (bnc#886148).
 
 -------------------------------------------------------------------
 Fri Jul 25 14:32:38 CEST 2014 - fcrozat@suse.com
 
 - Add plymouth-ignore-cirrusdrm.patch: ignore cirrus drm and use fb
-  instead [bnc#888590]
+  instead (bnc#888590)
 
 -------------------------------------------------------------------
 Thu Jul 24 16:30:43 UTC 2014 - fcrozat@suse.com
@@ -258,7 +264,7 @@ Thu Jul 24 16:30:43 UTC 2014 - fcrozat@suse.com
 Tue Jul  8 16:04:38 UTC 2014 - fcrozat@suse.com
 
 - Update 0001-Some-greenish-openSUSE-colors.patch to also use SUSE
-  colors on tribar [bnc#886148]
+  colors on tribar (bnc#886148)
 
 -------------------------------------------------------------------
 Fri Jun 27 11:27:02 UTC 2014 - fcrozat@suse.com

plymouth.spec

@@ -20,31 +20,46 @@
 %define plymouthclient_execdir %{_bindir}
 %define plymouth_libdir %{_libdir}
 %define plymouth_initrd_file /boot/initrd-plymouth.img
+
 Name:           plymouth
 Version:        0.9.3+git20171220.6e9e95d
 Release:        0
 Summary:        Graphical Boot Animation and Logger
-License:        GPL-2.0-or-later
+License:        GPL-2.0+
 Group:          System/Base
-URL:            http://freedesktop.org/software/plymouth/releases
+Url:            http://www.freedesktop.org/wiki/Software/Plymouth
-# Switched to git snapshot to ease bugfix inclusion
+
 Source0:        %{name}-%{version}.tar.xz
 Source1:        boot-duration
-# PATCH-OPENSUSE -- Handle correctly multiple displays with different sizes
+# PATCH-FIX-OPENSUSE plymouth-dracut-path.patch tittiatcoke@gmail.com
-Patch3:         plymouth-fix-window-size
+# -- prefix is /usr/sbin and /usr/bin
-# PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin
 Patch9:         plymouth-dracut-path.patch
+# PATCH-FIX-OPENSUSE 0001-Some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com
+# -- to use suse colors in tribar.
 Patch10:        0001-Some-greenish-openSUSE-colors.patch
-# PATCH-OPENSUSE -- plymouth-correct-runtime-dir.patch tittiatcoke@gmail.com -- make sure the runtime directory is /run and not /var/run
+# PATCH-FIX-OPENSUSE plymouth-correct-runtime-dir.patch tittiatcoke@gmail.com 
+# -- make sure the runtime directory is /run and not /var/run
 Patch16:        plymouth-correct-runtime-dir.patch
-# PATCH-FIX-UPSTREAM plymouth-manpages.patch idoenmez@suse.de -- Fix man page installation
+# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de 
+# -- Fix man page installation
 Patch17:        plymouth-manpages.patch
-# PATCH-FIX-OPENSUSE only_use_fb_for_cirrus_bochs.patch fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise
+# PATCH-FIX-UPSTREAM plymouth-ignore-cirrusdrm.patch bnc#888590 fcrozat@suse.com 
+# -- ignore cirrusdrm, use fb instead
+# Patch26:        plymouth-ignore-cirrusdrm.patch
+# PATCH-FIX-OPENSUSE only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com 
+# -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer 
+# -- driver and plymouth-ignore-cirrusdrm.patch with single patch.
 Patch26:        only_use_fb_for_cirrus_bochs.patch
-# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch fvogt@suse.com -- add ability to output text in initrd
+# PATCH-FIX-UPSTREAM 
+# 0001-Add-label-ft-plugin.patch 
+# 0002-Install-label-ft-plugin-into-initrd-if-available.patch 
+# 0003-fix_null_deref.patch 
+# boo#959986 fvogt@suse.com
+# -- add ability to output text in initrd needed for encryption.
 Patch30:        0001-Add-label-ft-plugin.patch
 Patch31:        0002-Install-label-ft-plugin-into-initrd-if-available.patch
 Patch32:        0003-fix_null_deref.patch
+
 BuildRequires:  automake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  kernel-headers
@@ -65,6 +80,7 @@ BuildRequires:  pkgconfig(libsystemd) >= 186
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(pango) >= 1.21.0
 BuildRequires:  pkgconfig(systemd) >= 186
+
 Requires:       %{name}-branding
 Requires:       gnu-unifont-bitmap-fonts
 Requires:       systemd >= 186
@@ -334,7 +350,6 @@ plugin.
 
 %prep
 %setup -q
-%patch3 -p1
 %patch9
 %patch10 -p1
 %patch16 -p1