- updated to 0.9.2 (note: new sonames)

- updated text-colors,restore-suspend patches

diff --git a/plymouth-restore-suspend.patch b/plymouth-restore-suspend.patch
index 166ffceb3b4657ee064f80673ca5e822fe65b87d..17bd8a2f746656479269b309709ad3b077f60f77 100644 (file)
--- a/plymouth-restore-suspend.patch
+++ b/plymouth-restore-suspend.patch
@@ -14,36 +14,29 @@ Conflicts:
  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
+--- plymouth-0.9.2/src/libply-splash-core/ply-boot-splash-plugin.h.orig        2015-05-24 21:36:57.996946648 +0200
++++ plymouth-0.9.2/src/libply-splash-core/ply-boot-splash-plugin.h     2015-05-24 21:40:09.206938626 +0200
+@@ -38,6 +38,8 @@
  {
-   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_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-0.9.2/src/plugins/splash/script/script-lib-plymouth.c.orig        2015-05-24 21:36:57.996946648 +0200
++++ plymouth-0.9.2/src/plugins/splash/script/script-lib-plymouth.c     2015-05-24 21:41:42.316934720 +0200
+@@ -70,6 +70,12 @@
+         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;

diff --git a/plymouth.spec b/plymouth.spec
index 842c45e87ab6d9e90b1b26131714793ff0241269..9bc995ae31a94ae3d8a59bf961132a9bf9ade4c0 100644 (file)
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -8,12 +8,12 @@
 Summary:       Graphical Boot Animation and Logger
 Summary(pl.UTF-8):     Graficzna animacja i logowanie startu systemu
 Name:          plymouth
-Version:       0.9.0
-Release:       2
+Version:       0.9.2
+Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       http://www.freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: 147150705417f025d036304e97e33c9c
+# Source0-md5: ff420994deb7ea203df678df92e7ab7d
 Source1:       %{name}-logo.png
 # Source1-md5: 6b38a868585adfd3a96a4ad16973c1f8
 Source2:       %{name}.tmpfiles
@@ -25,12 +25,13 @@ URL:                http://www.freedesktop.org/wiki/Software/Plymouth
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.11
 BuildRequires: cairo-devel
-BuildRequires: gtk+2-devel >= 2:2.12.0
+BuildRequires: gtk+3-devel >= 3.14.0
 %{?with_drm:BuildRequires:     libdrm-devel}
 BuildRequires: libpng-devel >= 2:1.2.16
 BuildRequires: libtool >= 2:2
 BuildRequires: pango-devel >= 1:1.21.0
 BuildRequires: pkgconfig
+BuildRequires: systemd-units
 BuildRequires: udev-devel
 BuildRequires: xorg-lib-libpciaccess-devel
 Requires:      %{name}-graphics-libs = %{version}-%{release}
@@ -72,6 +73,7 @@ Summary:      Plymouth graphics libraries
 Summary(pl.UTF-8):     Biblioteki graficzne Plymouth
 Group:         Development/Libraries
 Requires:      %{name}-core-libs = %{version}-%{release}
+Requires:      gtk+3 >= 3.14.0
 Provides:      %{name}-graphics-libs = %{version}-%{release}
 Obsoletes:     plymouth-libs < %{version}-%{release}
 Conflicts:     plymouth-libs < 0.8.4-0.20120319.1
@@ -481,18 +483,18 @@ fi
 %files core-libs
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libply.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libply.so.2
+%attr(755,root,root) %ghost /%{_lib}/libply.so.4
 %attr(755,root,root) /%{_lib}/libply-splash-core.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libply-splash-core.so.2
+%attr(755,root,root) %ghost /%{_lib}/libply-splash-core.so.4
 %attr(755,root,root) %{_libdir}/libply-boot-client.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libply-boot-client.so.2
+%attr(755,root,root) %ghost %{_libdir}/libply-boot-client.so.4
 %dir %{_libdir}/plymouth
 %dir %{_libdir}/plymouth/renderers
 
 %files graphics-libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libply-splash-graphics.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libply-splash-graphics.so.2
+%attr(755,root,root) %ghost %{_libdir}/libply-splash-graphics.so.4
 %attr(755,root,root) %{_libdir}/plymouth/renderers/x11.so
 
 %files devel

diff --git a/text-colors.patch b/text-colors.patch
index a14c8f3c8273de8d12874eecad7b5df42844d159..bf14387247b7cca32680f1f9ea67d10b60e183d7 100644 (file)
--- a/text-colors.patch
+++ b/text-colors.patch
@@ -1,30 +1,33 @@
---- plymouth-0.8.4/src/plugins/splash/tribar/plugin.c~ 2011-02-09 21:07:14.000000000 +0100
-+++ plymouth-0.8.4/src/plugins/splash/tribar/plugin.c  2012-04-27 12:56:30.461837997 +0200
-@@ -183,10 +183,10 @@
-                                     0xffffff);
-   ply_terminal_set_color_hex_value (terminal,
-                                     PLY_TERMINAL_COLOR_BLUE,
--                                    0x0073B3);
-+                                    PLYMOUTH_BACKGROUND_START_COLOR);
-   ply_terminal_set_color_hex_value (terminal,
-                                     PLY_TERMINAL_COLOR_BROWN,
--                                    0x00457E);
-+                                    PLYMOUTH_BACKGROUND_END_COLOR);
+--- plymouth-0.9.2/src/plugins/splash/tribar/plugin.c.orig     2015-05-24 21:32:03.443625675 +0200
++++ plymouth-0.9.2/src/plugins/splash/tribar/plugin.c  2015-05-24 21:35:09.136951216 +0200
+@@ -180,10 +180,10 @@
+                                           0xffffff);
+         ply_terminal_set_color_hex_value (terminal,
+                                           PLY_TERMINAL_COLOR_BLUE,
+-                                          0x0073B3);
++                                          PLYMOUTH_BACKGROUND_START_COLOR);
+         ply_terminal_set_color_hex_value (terminal,
+                                           PLY_TERMINAL_COLOR_BROWN,
+-                                          0x00457E);
++                                          PLYMOUTH_BACKGROUND_END_COLOR);
  
-   ply_text_display_set_background_color (view->display,
-                                          PLY_TERMINAL_COLOR_BLACK);
---- plymouth-0.8.8/src/plugins/splash/text/plugin.c~   2014-04-29 18:42:57.000000000 +0200
-+++ plymouth-0.8.8/src/plugins/splash/text/plugin.c    2014-04-29 18:55:53.714017941 +0200
-@@ -177,10 +177,10 @@
-                                     0xffffff);
-   ply_terminal_set_color_hex_value (terminal,
-                                     PLY_TERMINAL_COLOR_BLUE,
--                                    0x3465a4);
-+                                    PLYMOUTH_BACKGROUND_START_COLOR);
-   ply_terminal_set_color_hex_value (terminal,
-                                     PLY_TERMINAL_COLOR_BROWN,
--                                    0x979a9b);
-+                                    PLYMOUTH_BACKGROUND_END_COLOR);
+         ply_text_display_set_background_color (view->display,
+                                                PLY_TERMINAL_COLOR_BLACK);
+--- plymouth-0.9.2/src/plugins/splash/text/plugin.c.orig       2015-05-24 21:32:03.446959010 +0200
++++ plymouth-0.9.2/src/plugins/splash/text/plugin.c    2015-05-24 21:36:36.543614214 +0200
+@@ -171,13 +171,13 @@
  
-   ply_text_display_set_background_color (view->display,
-                                          PLY_TERMINAL_COLOR_BLACK);
+         ply_terminal_set_color_hex_value (terminal,
+                                           PLY_TERMINAL_COLOR_BLACK,
+-                                          0x2e3436);
++                                          PLYMOUTH_BACKGROUND_START_COLOR);
+         ply_terminal_set_color_hex_value (terminal,
+                                           PLY_TERMINAL_COLOR_WHITE,
+                                           0xffffff);
+         ply_terminal_set_color_hex_value (terminal,
+                                           PLY_TERMINAL_COLOR_BROWN,
+-                                          0x979a9b);
++                                          PLYMOUTH_BACKGROUND_END_COLOR);
+ 
+         ply_text_display_set_background_color (view->display,
+                                                PLY_TERMINAL_COLOR_BLACK);