Accepting request 129260 from Base:System

- Ship /etc/os-release in the initrd so that the pretty name is
  displayed in text-splash mode
- Give the text-splash some SUSE-typical green coloring (forwarded request 129223 from jengelh)

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

0001-Some-greenish-openSUSE-colors.patch

@@ -0,0 +1,33 @@
+From 9e69959ad2d7624936832421dfb0cd1fee47fefc Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Sun, 29 Jul 2012 20:38:50 +0200
+Subject: [PATCH] Some greenish openSUSE colors
+
+---
+ src/plugins/splash/text/plugin.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
+index 50059be..d9235c5 100644
+--- a/src/plugins/splash/text/plugin.c
++++ b/src/plugins/splash/text/plugin.c
+@@ -180,13 +180,13 @@ view_start_animation (view_t *view)
+                                     0x000000);
+   ply_terminal_set_color_hex_value (terminal,
+                                     PLY_TERMINAL_COLOR_WHITE,
+-                                    0xffffff);
++                                    0x40ff00);
+   ply_terminal_set_color_hex_value (terminal,
+                                     PLY_TERMINAL_COLOR_BLUE,
+-                                    0x0073B3);
++                                    0x20a000);
+   ply_terminal_set_color_hex_value (terminal,
+                                     PLY_TERMINAL_COLOR_BROWN,
+-                                    0x00457E);
++                                    0x106000);
+ 
+   ply_text_display_set_background_color (view->display,
+                                          PLY_TERMINAL_COLOR_BLACK);
+-- 
+1.7.7
+

0001-ply-text-progress-bar-strip-quotes-if-present.patch

@@ -0,0 +1,29 @@
+From fe7008c13b38898d78ff4ecf897fea127982fd9b Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Sun, 29 Jul 2012 20:25:21 +0200
+Subject: [PATCH] ply-text-progress-bar: strip quotes if present
+
+The syntax for sysconfig-style files allows for quotes.
+---
+ src/libply-splash-core/ply-text-progress-bar.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/src/libply-splash-core/ply-text-progress-bar.c b/src/libply-splash-core/ply-text-progress-bar.c
+index 0f4d74e..0b29690 100644
+--- a/src/libply-splash-core/ply-text-progress-bar.c
++++ b/src/libply-splash-core/ply-text-progress-bar.c
+@@ -137,6 +137,11 @@ get_os_string (void)
+           if (pos2 != NULL)
+             *pos2 = '\0';
+ 
++          if ((*pos == '\"' && pos2[-1] == '\"') ||
++              (*pos == '\'' && pos2[-1] == '\'')) {
++		++pos;
++		*--pos2 = '\0';
++          }
+           asprintf (&os_string, " %s", pos);
+         }
+       goto out;
+-- 
+1.7.7
+

branding-suse.tar.xz

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

opensuse-logo.png

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

plymouth.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sun Jul 29 18:44:18 UTC 2012 - jengelh@inai.de
+
+- Ship /etc/os-release in the initrd so that the pretty name is
+  displayed in text-splash mode
+- Give the text-splash some SUSE-typical green coloring
+
+-------------------------------------------------------------------
+Sun Jul 29 18:07:39 UTC 2012 - dmueller@suse.com
+
+- fix build for ARM
+
+-------------------------------------------------------------------
+Thu Jul 26 13:33:28 UTC 2012 - tittiatcoke@gmail.com
+
+- Move the openSUSE branding to its rightful place
+
 -------------------------------------------------------------------
 Fri Jul 20 08:57:25 UTC 2012 - fcrozat@suse.com
 

plymouth.spec

@@ -31,8 +31,6 @@ Group:          System/Base
 Url:            http://freedesktop.org/software/plymouth/releases
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        boot-duration
-Source2:        opensuse-logo.png
-Source3:        branding-suse.tar.xz
 # PATCH-OPENSUSE -- Support the openSUSE initrd
 Patch1:         suse-initrd-support
 # PATCH-OPENSUSE -- Add line numbers to tracing output
@@ -49,13 +47,16 @@ Patch6:         plymouth-systemd-target.patch
 Patch7:         plymouth-udevadm-path.patch
 # PATCH-OPENSUSE -- Remove tag not understood by systemd v44
 Patch8:         systemd-no-warning.patch
+# PATCH-FIX-UPSTREAM -- Recognize quotes often used in sysconfig-style files
+Patch9:         0001-ply-text-progress-bar-strip-quotes-if-present.patch
+Patch10:        0001-Some-greenish-openSUSE-colors.patch
 BuildRequires:  automake
 BuildRequires:  kernel-headers
 BuildRequires:  libtool
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
 BuildRequires:  pkgconfig(libdrm)
-%ifnarch ppc ppc64
+%ifarch %ix86 x86_64
 BuildRequires:  pkgconfig(libdrm_intel)
 %endif
 BuildRequires:  pkgconfig(libdrm_nouveau)
@@ -237,34 +238,6 @@ Plymouth. It features an extensible, scriptable boot splash
 language that simplifies the process of designing custom
 boot splash themes.
 
-%package branding-upstream
-Summary:        Plymouth default theme
-Group:          System/Base
-Requires:       plymouth-theme-solar = %{version}
-Requires(pre):  %{name}
-Supplements:    packageand(plymouth:branding-upstream)
-Provides:       %{name}-branding = %{version}
-Conflicts:      otherproviders(plymouth-branding)
-BuildArch:      noarch
-
-%description branding-upstream
-This metapackage tracks the Plymouth default theme from upstream.
-
-%package branding-openSUSE
-Summary:        Plymouth openSUSE theme
-Group:          System/Base
-Requires:       plymouth-plugin-label = %{version}
-Requires:       plymouth-plugin-script = %{version}
-Requires(post): %{name}-scripts
-Supplements:    packageand(plymouth:branding-openSUSE)
-Provides:       %{name}-branding = %{version}
-Conflicts:      otherproviders(plymouth-branding)
-BuildArch:      noarch
-
-%description branding-openSUSE
-This metapackage tracks the Plymouth openSUSE branding.
-
-
 %package theme-fade-in
 Summary:        Plymouth "Fade-In" theme
 Group:          System/Base
@@ -335,6 +308,7 @@ plugin.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch -P 9 -P 10 -p1
 
 # replace builddate with patch0date
 sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
@@ -347,7 +321,6 @@ autoreconf -fiv
 %configure --disable-static                                      \
            --enable-systemd-integration                          \
            --enable-tracing --disable-tests                      \
-           --with-logo=%{_datadir}/plymouth/logo.png    \
            --with-background-start-color-stop=0x1A3D1F           \
            --with-background-end-color-stop=0x4EA65C             \
            --with-background-color=0x3391cd                      \
@@ -357,7 +330,8 @@ autoreconf -fiv
            --without-rhgb-compat-link                            \
            --with-boot-tty=/dev/tty7                             \
            --with-shutdown-tty=/dev/tty1                         \
-           --without-gdm-autostart-file
+           --without-gdm-autostart-file                          \
+           --with-release-file=/etc/os-release
 
 make %{?_smp_mflags}
 
@@ -384,22 +358,12 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/plymouth
 mkdir -p %{buildroot}%{_localstatedir}/run/plymouth
 cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_datadir}/plymouth/default-boot-duration
 cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_localstatedir}/lib/plymouth
-cp %{SOURCE2} %{buildroot}%{_datadir}/plymouth/logo.png
 cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouth.conf
 
 mkdir -p %{buildroot}/lib/mkinitrd/scripts
 install -t %{buildroot}/lib/mkinitrd/scripts \
 	   scripts/{setup,boot}-plymouth*.sh
 
-# Unpack the openSUSE branding. This branding is temporarily in this package 
-# until the official one is created/accepted in the main branding package
-pushd  %{buildroot}%{_datadir}/plymouth/themes/
-tar -Jxf %{SOURCE3} 
-popd
-
-%clean
-rm -rf %{buildroot}
-
 %post
 if [ ! -e /.buildenv ]; then 
    [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
@@ -482,22 +446,6 @@ if [ $1 -eq 0 ]; then
     fi
 fi
 
-%post branding-openSUSE
-if [ $1 -eq 1 -a ! -e /.buildenv ]; then
-   export LIB=%{_libdir}
-   if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
-      %{_sbindir}/plymouth-set-default-theme -R openSUSE
-   fi
-fi
-
-%postun branding-openSUSE
-if [ $1 -eq 0 ]; then
-    export LIB=%{_libdir}
-    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" ]; then
-        %{_sbindir}/plymouth-set-default-theme -R --reset
-    fi
-fi
-
 %files
 %defattr(-, root, root)
 %doc AUTHORS NEWS README
@@ -509,7 +457,8 @@ fi
 %dir %{_libdir}/plymouth
 %dir %{_libdir}/plymouth/renderers
 %dir %{_sysconfdir}/plymouth
-%{_sysconfdir}/plymouth/plymouth.conf
+%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf
+%config(noreplace) %{_sysconfdir}/plymouth/plymouth.conf
 %{plymouthdaemon_execdir}/plymouthd
 %{plymouthclient_execdir}/plymouth
 /bin/plymouth
@@ -521,6 +470,7 @@ fi
 %{_datadir}/plymouth/themes/details/details.plymouth
 %{_datadir}/plymouth/themes/text/text.plymouth
 %{_datadir}/plymouth/plymouthd.defaults
+%{_datadir}/plymouth/bizcom.png
 %ghost %{_localstatedir}/run/plymouth
 %{_localstatedir}/spool/plymouth
 %{_mandir}/man?/*
@@ -632,15 +582,4 @@ fi
 %{_datadir}/plymouth/themes/script/script.script
 %{_datadir}/plymouth/themes/script/script.plymouth
 
-%files branding-upstream
-%defattr(-, root, root)
-%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf
-%{_datadir}/plymouth/logo.png
-
-%files branding-openSUSE
-%defattr(-, root, root)
-%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf
-%{_datadir}/plymouth/logo.png
-%{_datadir}/plymouth/themes/openSUSE/
-
 %changelog

suse-initrd-support

@@ -57,7 +57,7 @@ Index: plymouth-0.8.4/scripts/setup-plymouth.sh.in
 ===================================================================
 --- /dev/null
 +++ plymouth-0.8.4/scripts/setup-plymouth.sh.in
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,60 @@
 +#!/bin/bash
 +#
 +#%stage: setup
@@ -82,9 +82,8 @@ Index: plymouth-0.8.4/scripts/setup-plymouth.sh.in
 +	/usr/share/plymouth/themes/details/details.plymouth \
 +	/usr/share/plymouth/plymouthd.defaults \
 +	/usr/share/plymouth/themes/${THEME}/* \
-+	/usr/share/plymouth/logo.png \
 +	/etc/plymouth/plymouthd.conf \
-+       /usr/share/fonts/uni/unifont.pcf.gz \
++       /usr/share/fonts/uni/unifont.pcf.gz /etc/os-release \
 +       /etc/fonts/fonts.conf \
 +       /etc/fonts/conf.d/69-unifont.conf \
 +       /etc/fonts/conf.avail/69-unifont.conf "