Accepting request 222597 from home:kigurame:branches:Base:System

Updated to recent git

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

0001-Make-plymouthd-real-daemon-and-save-old-log.patch

@@ -1,50 +0,0 @@
-From: Werner Fink <werner@suse.de>
-Subject: All daemons should call setsid(2) to become a real daemons
-
-All daemons should call setsid(2) to become a real daemons without
-controlling terminal.  Beside this the old boot log will help for
-debugging and for support.
-
----
- libply/ply-utils.c |    1 +
- main.c             |    5 +++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
---- a/src/libply/ply-utils.c
-+++ b/src/libply/ply-utils.c	2014-02-12 15:05:49.895141867 +0100
-@@ -815,6 +815,7 @@ ply_create_daemon (void)
- 
-       _exit ((int) byte);
-     }
-+  setsid();
-   close (receiver_fd);
- 
-   handle = calloc (1, sizeof (int));
---- a/src/main.c
-+++ b/src/main.c	2014-02-12 14:43:49.216569414 +0100
-@@ -639,7 +639,7 @@ get_log_file_for_mode (ply_mode_t mode)
-       break;
-     case PLY_MODE_SHUTDOWN:
-     case PLY_MODE_UPDATES:
--      filename = _PATH_DEVNULL;
-+      filename = PLYMOUTH_LOG_DIRECTORY "/boot.log";
-       break;
-     default:
-       ply_error ("Unhandled case in %s line %d\n", __FILE__, __LINE__);
-@@ -663,7 +663,7 @@ get_log_spool_file_for_mode (ply_mode_t
-       break;
-     case PLY_MODE_SHUTDOWN:
-     case PLY_MODE_UPDATES:
--      filename = NULL;
-+      filename = PLYMOUTH_SPOOL_DIRECTORY "/boot.log";
-       break;
-     default:
-       ply_error ("Unhandled case in %s line %d\n", __FILE__, __LINE__);
-@@ -715,6 +715,7 @@ prepare_logging (state_t *state)
-   if (logfile != NULL)
-     {
-       ply_trace ("opening log '%s'", logfile);
-+      rename(logfile, PLYMOUTH_LOG_DIRECTORY "/boot.olog");
-       ply_terminal_session_open_log (state->session, logfile);
- 
-       if (state->number_of_errors > 0)

0001-Some-greenish-openSUSE-colors.patch

@@ -19,11 +19,11 @@ index 50059be..d9235c5 100644
 +                                    0x40ff00);
    ply_terminal_set_color_hex_value (terminal,
                                      PLY_TERMINAL_COLOR_BLUE,
--                                    0x0073B3);
+-                                    0x3465a4);
 +                                    0x20a000);
    ply_terminal_set_color_hex_value (terminal,
                                      PLY_TERMINAL_COLOR_BROWN,
--                                    0x00457E);
+-                                    0x979a9b);
 +                                    0x106000);
  
    ply_text_display_set_background_color (view->display,

plymouth-0.8.8_git201309032142.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c1a7c2e8e964c4c650b59910918a878575bda58b6671726a55447bc70f6faa2
-size 789284

plymouth-0.8.8_git20140207.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a77a8ae80c30099fb93999f35a95f7e28a6e27ab6d84eb0d434c8bb9cbba25af
+size 4747424

plymouth-dracut-path.patch

@@ -4,8 +4,8 @@
  [ -z "$INITRDDIR" ] && usage error
  
  mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
--inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /sbin/plymouthd
+-inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR
--inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /bin/plymouth
+-inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR
 +inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /usr/sbin/plymouthd
 +inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /usr/bin/plymouth
  inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR

plymouth.changes

@@ -1,12 +1,3 @@
--------------------------------------------------------------------
-Wed Feb 12 14:19:48 UTC 2014 - werner@suse.de
-
-- Add patch
-  0001-Make-plymouthd-real-daemon-and-save-old-log.patch
-  all daemons should call setsid(2) to become a real daemons without
-  controlling terminal.  Beside this the old boot log will help for
-  debugging and for support.
-
 -------------------------------------------------------------------
 Thu Dec 12 17:42:35 UTC 2013 - uweigand@de.ibm.com
 

plymouth.spec

@@ -22,7 +22,7 @@
 %define plymouth_initrd_file /boot/initrd-plymouth.img
 
 Name:           plymouth
-Version:        0.8.8_git201309032142
+Version:        0.8.8_git20140207
 Release:        0
 Summary:        Graphical Boot Animation and Logger
 License:        GPL-2.0+
@@ -43,11 +43,12 @@ Patch9:         plymouth-dracut-path.patch
 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
 Patch16:        plymouth-correct-runtime-dir.patch
-# PATCH-SUSE -- 0001-Make-plymouthd-real-daemon-and-save-old-log.patch werner@suse.de -- All daemons should call setsid(2) to become a real daemons
-Patch17:        0001-Make-plymouthd-real-daemon-and-save-old-log.patch
 BuildRequires:  automake
+BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  kernel-headers
 BuildRequires:  libtool
+BuildRequires:  libudev-devel
+BuildRequires:  libxslt
 BuildRequires:  module-init-tools
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
@@ -239,6 +240,19 @@ Plymouth. It features an extensible, scriptable boot splash
 language that simplifies the process of designing custom
 boot splash themes.
 
+%package plugin-tribar
+Summary:        Plymouth "script" plugin
+Group:          System/Base
+Requires:       libply-splash-core2 = %{version}
+Requires:       libply-splash-graphics2 = %{version}
+Requires:       libply2 = %{version}
+
+%description plugin-tribar
+This package contains the "tribar" boot splash plugin for
+Plymouth. It features an extensible, scriptable boot splash
+language that simplifies the process of designing custom
+boot splash themes.
+
 %package theme-fade-in
 Summary:        Plymouth "Fade-In" theme
 Group:          System/Base
@@ -287,6 +301,17 @@ BuildArch:      noarch
 This package contains the "Solar" boot splash theme for
 Plymouth. It features a blue flamed sun with animated solar flares.
 
+%package theme-tribar
+Summary:        Plymouth "Tribar" theme
+Group:          System/Base
+Requires:       %{name}-plugin-tribar = %{version}
+Requires(post): %{name}-scripts
+BuildArch:      noarch
+
+%description theme-tribar
+This package contains the "Tribar" boot splash theme for
+Plymouth
+
 %package theme-script
 Summary:        Plymouth "Script" plugin
 Group:          System/Base
@@ -310,7 +335,6 @@ plugin.
 %patch9 -p0
 %patch10 -p1
 %patch16 -p1
-%patch17 -p1
 # replace builddate with patch0date
 sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
 
@@ -330,11 +354,10 @@ autoreconf -fiv
            --with-log-viewer                                     \
            --without-rhgb-compat-link                            \
            --with-boot-tty=/dev/tty7                             \
-           --with-shutdown-tty=/dev/tty7                         \
+           --with-shutdown-tty=/dev/tty1                         \
            --without-gdm-autostart-file                          \
            --with-release-file=/etc/os-release
 
-make clean
 make %{?_smp_mflags} V=1
 
 %install
@@ -594,10 +617,19 @@ fi
 %{_datadir}/plymouth/themes/solar/*.png
 %{_datadir}/plymouth/themes/solar/solar.plymouth
 
+%files theme-tribar
+%defattr(-, root, root)
+%dir %{_datadir}/plymouth/themes/tribar
+%{_datadir}/plymouth/themes/tribar/*.*
+
 %files plugin-two-step
 %defattr(-, root, root)
 %{_libdir}/plymouth/two-step.so
 
+%files plugin-tribar
+%defattr(-, root, root)
+%{_libdir}/plymouth/tribar.so
+
 %files plugin-script
 %defattr(-, root, root)
 %{_libdir}/plymouth/script.so

suse-initrd-support

@@ -136,5 +136,5 @@ Index: plymouth-0.8.8_git201309032142/scripts/plymouth-update-initrd
 +++ plymouth-0.8.8_git201309032142/scripts/plymouth-update-initrd
 @@ -1,2 +1,2 @@
  #!/bin/bash
--mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)
+-dracut -f
 +/sbin/mkinitrd