commit bootsplash for openSUSE:Factory
Hello community, here is the log from the commit of package bootsplash for openSUSE:Factory checked in at 2012-08-04 09:07:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bootsplash (Old) and /work/SRC/openSUSE:Factory/.bootsplash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bootsplash", Maintainer is "mls@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bootsplash/bootsplash.changes 2011-09-23 01:52:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bootsplash.new/bootsplash.changes 2012-08-04 09:07:05.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 31 14:55:54 CEST 2012 - tiwai@suse.de + +- Fall back to default resolution 800x600 if no corresponding + bootsplash config or image is found (bnc#770244) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bootsplash.spec ++++++ --- /var/tmp/diff_new_pack.pxpEKi/_old 2012-08-04 09:07:06.000000000 +0200 +++ /var/tmp/diff_new_pack.pxpEKi/_new 2012-08-04 09:07:06.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package bootsplash # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,12 +16,13 @@ # - Name: bootsplash -BuildRequires: freetype2-devel libjpeg-devel libmng-devel +BuildRequires: freetype2-devel +BuildRequires: libjpeg-devel +BuildRequires: libmng-devel Url: http://www.bootsplash.org/ Version: 3.3 -Release: 171 +Release: 0 Summary: Graphical System Boot Utilities License: GPL-2.0+ Group: System/Boot ++++++ mkinitrd-setup.sh ++++++ --- /var/tmp/diff_new_pack.pxpEKi/_old 2012-08-04 09:07:06.000000000 +0200 +++ /var/tmp/diff_new_pack.pxpEKi/_new 2012-08-04 09:07:06.000000000 +0200 @@ -104,6 +104,16 @@ splash_image="$splash_image $cfgname" fi done + if [ -z "$splash_image" ]; then + # use default size (bnc#770244) + size="800x600" + bootsplash_picture="$themes_dir/$THEME/images/bootsplash-$size.jpg" + cfgname="$themes_dir/$THEME/config/bootsplash-$size.cfg" + if [ -r $cfgname -a -r $bootsplash_picture ] ; then + echo -n "fallback ${splash_image:+, }$THEME ($size)" + splash_image="$splash_image $cfgname" + fi + fi echo else echo "no theme selected" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de