Hello community, here is the log from the commit of package plymouth for openSUSE:12.2 checked in at 2012-08-04 09:24:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/plymouth (Old) and /work/SRC/openSUSE:12.2/.plymouth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/plymouth/plymouth.changes 2012-07-31 14:16:01.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.plymouth.new/plymouth.changes 2012-08-04 09:26:19.000000000 +0200 @@ -1,0 +2,17 @@ +Sun Jul 29 18:44:18 UTC 2012 - jeng...@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 - dmuel...@suse.com + +- fix build for ARM + +------------------------------------------------------------------- +Thu Jul 26 13:33:28 UTC 2012 - tittiatc...@gmail.com + +- Move the openSUSE branding to its rightful place + +------------------------------------------------------------------- Old: ---- branding-suse.tar.xz opensuse-logo.png New: ---- 0001-Some-greenish-openSUSE-colors.patch 0001-ply-text-progress-bar-strip-quotes-if-present.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.iIeUj6/_old 2012-08-04 09:26:24.000000000 +0200 +++ /var/tmp/diff_new_pack.iIeUj6/_new 2012-08-04 09:26:24.000000000 +0200 @@ -31,8 +31,6 @@ 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 @@ 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 @@ 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 @@ %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 @@ %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 @@ --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}/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 @@ 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 @@ %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 @@ %{_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 @@ %{_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 ++++++ 0001-Some-greenish-openSUSE-colors.patch ++++++ >From 9e69959ad2d7624936832421dfb0cd1fee47fefc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <jeng...@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 ++++++ >From fe7008c13b38898d78ff4ecf897fea127982fd9b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <jeng...@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 ++++++ suse-initrd-support ++++++ --- /var/tmp/diff_new_pack.iIeUj6/_old 2012-08-04 09:26:25.000000000 +0200 +++ /var/tmp/diff_new_pack.iIeUj6/_new 2012-08-04 09:26:25.000000000 +0200 @@ -57,7 +57,7 @@ =================================================================== --- /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 @@ + /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 " -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
