Hello community, here is the log from the commit of package gfxboot for openSUSE:Factory checked in at Fri Jul 8 09:40:47 CEST 2011.
-------- --- gfxboot/gfxboot.changes 2011-04-18 15:46:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/gfxboot/gfxboot.changes 2011-07-07 17:14:11.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Jul 7 17:11:53 CEST 2011 - snw...@suse.de + +- added KDE theme +- update upstream theme + +------------------------------------------------------------------- +Thu Jul 7 16:34:42 CEST 2011 - snw...@suse.de + +- added menu to select init variant (bnc #704417) +- fix script in case we are on no branch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gfxboot-4.4.1.tar.bz2 New: ---- KDE.tar.bz2 _service:format_spec_file:gfxboot.spec gfxboot-4.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _service:format_spec_file:gfxboot.spec ++++++ # # spec file for package gfxboot # # Copyright (c) 2011 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: gfxboot BuildRequires: freetype2-devel fribidi libxslt nasm perl-HTML-Parser sgml-skel w3m xmlto ExclusiveArch: %ix86 x86_64 License: GPLv2+ Group: System/Boot Recommends: gfxboot-theme >= 4 Requires: coreutils cpio mktemp perl master-boot-code dosfstools mtools perl-HTML-Parser AutoReqProv: on Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX Version: 4.4.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gfxboot-4.4.3.tar.bz2 Source1: KDE.tar.bz2 Source2: openSUSE.tar.bz2 Source3: SLED.tar.bz2 Source4: SLES.tar.bz2 Source5: upstream.tar.bz2 Source6: examples.tar.bz2 %description Tools to configure your bootloader graphics. %package devel License: GPLv2+ Summary: Tools for creating a graphical boot logo Group: Development/Libraries/C and C++ Requires: %name = %version perl-HTML-Parser %description devel Here you find the necessary programs to create your own graphical boot logo. The logo can be used with grub, lilo or syslinux. %package branding-upstream License: GPLv2+ Supplements: packageand(gfxboot:branding-upstream) Provides: gfxboot-theme Summary: gfxboot upstream theme AutoReqProv: on Group: System/Boot PreReq: gfxboot >= 4 %description branding-upstream upstream theme for gfxboot (bootloader graphics). %package branding-openSUSE License: GPLv2+ Supplements: packageand(gfxboot:branding-openSUSE) Provides: gfxboot-theme Obsoletes: bootloader-theme-SUSELinux-Prof Summary: gfxboot openSUSE theme AutoReqProv: on Group: System/Boot PreReq: gfxboot >= 4 %description branding-openSUSE openSUSE theme for gfxboot (bootloader graphics). %package branding-SLES License: GPLv2+ Supplements: packageand(gfxboot:branding-SLES) Provides: gfxboot-theme Obsoletes: bootloader-theme-SLES Summary: gfxboot SLES theme AutoReqProv: on Group: System/Boot PreReq: gfxboot >= 4 %description branding-SLES SLES theme for gfxboot (bootloader graphics). %package branding-SLED License: GPLv2+ Supplements: packageand(gfxboot:branding-SLED) Provides: gfxboot-theme Obsoletes: bootloader-theme-NLD Summary: gfxboot SLED theme AutoReqProv: on Group: System/Boot PreReq: gfxboot >= 4 %description branding-SLED SLED theme for gfxboot (bootloader graphics). %package branding-KDE License: GPLv2+ Supplements: packageand(gfxboot:branding-KDE) Provides: gfxboot-theme Summary: gfxboot KDE theme AutoReqProv: on Group: System/Boot PreReq: gfxboot >= 4 %description branding-KDE KDE theme for gfxboot (bootloader graphics). %prep %setup %setup -T -D -a 1 %setup -T -D -a 2 %setup -T -D -a 3 %setup -T -D -a 4 %setup -T -D -a 5 %setup -T -D -a 6 %build # fix build export SUSE_ASNEEDED=0 make DESTDIR=%{buildroot} installsrc make X11LIBS=/usr/X11R6/%_lib make doc make themes %install make DESTDIR=%{buildroot} install gzip -9c doc/gfxboot.8 >gfxboot.8.gz install -d -m 755 %{buildroot}%{_mandir}/man8 install -m 644 gfxboot.8.gz %{buildroot}%{_mandir}/man8 mkdir %{buildroot}/boot touch %{buildroot}/boot/message %post branding-upstream gfxboot --update-theme upstream %post branding-openSUSE gfxboot --update-theme openSUSE %post branding-SLES gfxboot --update-theme SLES %post branding-SLED gfxboot --update-theme SLED %post branding-KDE gfxboot --update-theme KDE %clean rm -rf %{buildroot} %files %defattr(-,root,root) /usr/sbin/gfxboot %doc %{_mandir}/man8/gfxboot.8.gz %files devel %defattr(-,root,root) /usr/sbin/gfxboot-compile /usr/sbin/gfxboot-font /usr/sbin/gfxtest %doc doc/gfxboot.html %doc doc/gfxboot.txt /usr/share/gfxboot %files branding-upstream %defattr(-,root,root) %dir /etc/bootsplash %dir /etc/bootsplash/themes /etc/bootsplash/themes/upstream %ghost /boot/message %files branding-openSUSE %defattr(-,root,root) %dir /etc/bootsplash %dir /etc/bootsplash/themes /etc/bootsplash/themes/openSUSE %ghost /boot/message %files branding-SLES %defattr(-,root,root) %dir /etc/bootsplash %dir /etc/bootsplash/themes /etc/bootsplash/themes/SLES %ghost /boot/message %files branding-SLED %defattr(-,root,root) %dir /etc/bootsplash %dir /etc/bootsplash/themes /etc/bootsplash/themes/SLED %ghost /boot/message %files branding-KDE %defattr(-,root,root) %dir /etc/bootsplash %dir /etc/bootsplash/themes /etc/bootsplash/themes/KDE %ghost /boot/message %changelog ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.sXs1e5/_old 2011-07-08 09:39:18.000000000 +0200 +++ /var/tmp/diff_new_pack.sXs1e5/_new 2011-07-08 09:39:18.000000000 +0200 @@ -27,15 +27,16 @@ Requires: coreutils cpio mktemp perl master-boot-code dosfstools mtools perl-HTML-Parser AutoReqProv: on Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX -Version: 4.4.1 +Version: 4.4.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: gfxboot-4.4.1.tar.bz2 -Source1: openSUSE.tar.bz2 -Source2: SLED.tar.bz2 -Source3: SLES.tar.bz2 -Source4: upstream.tar.bz2 -Source5: examples.tar.bz2 +Source: gfxboot-4.4.3.tar.bz2 +Source1: KDE.tar.bz2 +Source2: openSUSE.tar.bz2 +Source3: SLED.tar.bz2 +Source4: SLES.tar.bz2 +Source5: upstream.tar.bz2 +Source6: examples.tar.bz2 %description Tools to configure your bootloader graphics. @@ -112,6 +113,19 @@ SLED theme for gfxboot (bootloader graphics). +%package branding-KDE +License: GPLv2+ +Supplements: packageand(gfxboot:branding-KDE) +Provides: gfxboot-theme +Summary: gfxboot KDE theme +AutoReqProv: on +Group: System/Boot +PreReq: gfxboot >= 4 + +%description branding-KDE +KDE theme for gfxboot (bootloader graphics). + + %prep %setup @@ -120,6 +134,7 @@ %setup -T -D -a 3 %setup -T -D -a 4 %setup -T -D -a 5 +%setup -T -D -a 6 %build # fix build @@ -149,6 +164,9 @@ %post branding-SLED gfxboot --update-theme SLED +%post branding-KDE +gfxboot --update-theme KDE + %clean rm -rf %{buildroot} @@ -194,4 +212,11 @@ /etc/bootsplash/themes/SLED %ghost /boot/message +%files branding-KDE +%defattr(-,root,root) +%dir /etc/bootsplash +%dir /etc/bootsplash/themes +/etc/bootsplash/themes/KDE +%ghost /boot/message + %changelog ++++++ SLED.tar.bz2 ++++++ ++++++ SLES.tar.bz2 ++++++ ++++++ examples.tar.bz2 ++++++ ++++++ gfxboot-4.4.1.tar.bz2 -> gfxboot-4.4.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.4.1/Makefile new/gfxboot-4.4.3/Makefile --- old/gfxboot-4.4.1/Makefile 2010-10-04 17:45:08.000000000 +0200 +++ new/gfxboot-4.4.3/Makefile 2011-07-07 17:00:50.000000000 +0200 @@ -7,7 +7,7 @@ VERSION := $(shell $(GIT2LOG) --version VERSION ; cat VERSION) # THEMES = $(wildcard themes/*) -THEMES = themes/upstream themes/openSUSE themes/SLES themes/SLED +THEMES = themes/upstream themes/openSUSE themes/SLES themes/SLED themes/KDE .PHONY: all clean distclean doc install installsrc themes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.4.1/VERSION new/gfxboot-4.4.3/VERSION --- old/gfxboot-4.4.1/VERSION 2011-04-18 15:45:52.000000000 +0200 +++ new/gfxboot-4.4.3/VERSION 2011-07-07 17:11:46.000000000 +0200 @@ -1 +1 @@ -4.4.1 +4.4.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.4.1/changelog new/gfxboot-4.4.3/changelog --- old/gfxboot-4.4.1/changelog 2011-04-18 15:45:53.000000000 +0200 +++ new/gfxboot-4.4.3/changelog 2011-07-07 17:11:47.000000000 +0200 @@ -1,4 +1,12 @@ -2011-04-18: HEAD +2011-07-07: HEAD + - added KDE theme + - update upstream theme + +2011-07-07: 4.4.2 + - added menu to select init variant (bnc #704417) + - fix script in case we are on no branch + +2011-04-18: 4.4.1 - restore compat with syslinux 3 - fix wrong mem access - pass back working dir as absolute path ++++++ openSUSE.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/config new/themes/openSUSE/config --- old/themes/openSUSE/config 2011-04-07 16:19:04.000000000 +0200 +++ new/themes/openSUSE/config 2011-07-07 16:33:33.000000000 +0200 @@ -1,2 +1,2 @@ -product=openSUSE 11.5 +product=openSUSE 12.1 based_on= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/common.inc new/themes/openSUSE/src/common.inc --- old/themes/openSUSE/src/common.inc 2011-04-18 15:43:14.000000000 +0200 +++ new/themes/openSUSE/src/common.inc 2011-07-07 16:33:35.000000000 +0200 @@ -385,6 +385,12 @@ } { pop } ifelse } if + xmenu.otheropts { + otheropts.options xmenu.otheropts .xm_current get get dup "" ne { + "%s " bc.cmd dup length add sprintf + } { pop } ifelse + } if + /cmdline.hidden over dup length .inp_hidden ge { .inp_hidden get } { pop .undef } ifelse def cmdline.hidden { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/dia_otheropts.inc new/themes/openSUSE/src/dia_otheropts.inc --- old/themes/openSUSE/src/dia_otheropts.inc 1970-01-01 01:00:00.000000000 +0100 +++ new/themes/openSUSE/src/dia_otheropts.inc 2011-07-07 16:33:35.000000000 +0200 @@ -0,0 +1,92 @@ +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% +% Various kernel options dialog. +% +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Some global vars. +% +/otheropts.default 0 def + +/otheropts.options [ + "" + "init=/bin/systemd" + "init=/bin/sh" +] def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Build otheropts list. +% +% ( ) ==> ( ) +% +/otheropts.init { + /xmenu.otheropts .xm_size array def + + /xmenu xmenu.otheropts def + + xmenu .xm_current otheropts.default put + xmenu .xm_list [ + "System V" + "Systemd" + "Shell" + ] put + xmenu .xm_title "Init Program" put + +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Update otheropts mode. +% +% ( ) ==> ( ) +% +/otheropts.update { + /xmenu xmenu.otheropts def + + /window.action actRedrawPanel def +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Show otheropts menu. +% +% ( ) => ( ) +% +/panel.otheropts { + "main" help.setcontext + + window.xmenu + dup .xmenu xmenu.otheropts put + dup .xmenu.update /otheropts.update put + dup window.init + window.show +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Return width of panel entry. +% +% ( ) => ( width ) +% +/panel.otheropts.width { + /xmenu xmenu.otheropts def + + pmenu.width +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Redraw panel entry. +% +% ( panel ) => ( ) +% +/panel.otheropts.update { + /xmenu xmenu.otheropts def + + pmenu.panel.update +} def + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/gfxboot.cfg new/themes/openSUSE/src/gfxboot.cfg --- old/themes/openSUSE/src/gfxboot.cfg 2010-10-04 14:50:42.000000000 +0200 +++ new/themes/openSUSE/src/gfxboot.cfg 2011-07-07 16:33:35.000000000 +0200 @@ -160,7 +160,7 @@ autodown=1 ; F-key assignments ; value can be one of: lang, video, install, kernelopts, dud, bits, keymap, -; profile, restore +; profile, restore, otheropts ; note1: 'bits' is only shown on x86_64, 'profile' only when a file 'profile' ; exists, 'restore' only when there is a boot entry 'restore' ; note2: F1 is always help, F9 enables speech output, F10 exits gfxboot @@ -189,6 +189,7 @@ key.F2=lang key.F3=profile key.F4=keymap +key.F5=otheropts key.F11=restore ; add 'lang' option with current locale addopt.lang=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/main.bc new/themes/openSUSE/src/main.bc --- old/themes/openSUSE/src/main.bc 2010-10-04 14:50:42.000000000 +0200 +++ new/themes/openSUSE/src/main.bc 2011-07-07 16:33:35.000000000 +0200 @@ -23,6 +23,7 @@ %% include dia_keymap.inc %% include dia_restore.inc %% include dia_net.inc +%% include dia_otheropts.inc %% include panel.inc %% include keytables.inc %% include locale.inc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/panel.inc new/themes/openSUSE/src/panel.inc --- old/themes/openSUSE/src/panel.inc 2010-10-04 14:50:42.000000000 +0200 +++ new/themes/openSUSE/src/panel.inc 2011-07-07 16:33:35.000000000 +0200 @@ -167,6 +167,7 @@ dup "video" eq { pop [ /panel.video /panel.video.width /panel.video.update /video.init ] return } if dup "install" eq { pop [ /panel.install /panel.install.width /panel.install.update /install.init ] return } if dup "kernelopts" eq { pop [ /panel.kernelopts /panel.kernelopts.width /panel.kernelopts.update /kernelopts.init ] return } if + dup "otheropts" eq { pop [ /panel.otheropts /panel.otheropts.width /panel.otheropts.update /otheropts.init ] return } if dup "dud" eq { pop [ /panel.dud /panel.dud.width /panel.dud.update /dud.init ] return } if dup "keymap" eq { pop [ /panel.keymap /panel.keymap.width /panel.keymap.update /keymap.init ] return } if ++++++ upstream.tar.bz2 ++++++ Files old/themes/upstream/data-boot/back.jpg and new/themes/upstream/data-boot/back.jpg differ Files old/themes/upstream/data-install/back.jpg and new/themes/upstream/data-install/back.jpg differ Files old/themes/upstream/data-install/welcome.jpg and new/themes/upstream/data-install/welcome.jpg differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
