Hello community, here is the log from the commit of package yast2-firstboot for openSUSE:Factory checked in at Thu Jan 7 16:26:10 CET 2010. -------- --- yast2-firstboot/yast2-firstboot.changes 2009-12-22 13:27:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-firstboot/yast2-firstboot.changes 2010-01-07 15:28:14.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 7 14:34:43 CET 2010 - jsuchome@suse.cz + +- added firstboot_licenses step able to show 2 license texts + (fate#306295) +- adapt to Language::SwitchToEnglishIfNeeded (bnc#479529) +- 2.19.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-firstboot-2.19.0.tar.bz2 New: ---- yast2-firstboot-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.lg8rQ6/_old 2010-01-07 16:26:05.000000000 +0100 +++ /var/tmp/diff_new_pack.lg8rQ6/_new 2010-01-07 16:26:05.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-firstboot (Version 2.19.0) +# spec file for package yast2-firstboot (Version 2.19.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,10 +19,10 @@ Name: yast2-firstboot -Version: 2.19.0 +Version: 2.19.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firstboot-2.19.0.tar.bz2 +Source0: yast2-firstboot-2.19.1.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later X11/MIT @@ -34,10 +34,10 @@ # yast2/NeworkDevices -> yast2/NetworkInterfaces Requires: yast2 >= 2.16.23 Requires: yast2-bootloader -# Keyboard::Write (), bnc#441404 -Requires: yast2-country >= 2.18.14 -# Installation startup scripts -Requires: yast2-installation +# Language::SwitchToEnglishIfNeeded +Requires: yast2-country >= 2.19.5 +# new version of inst_license +Requires: yast2-installation >= 2.19.0 BuildArch: noarch Summary: YaST2 - Initial System Configuration PreReq: %fillup_prereq @@ -54,7 +54,7 @@ created to personalize the system. %prep -%setup -n yast2-firstboot-2.19.0 +%setup -n yast2-firstboot-2.19.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-firstboot-2.19.0.tar.bz2 -> yast2-firstboot-2.19.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/VERSION new/yast2-firstboot-2.19.1/VERSION --- old/yast2-firstboot-2.19.0/VERSION 2009-12-22 13:04:33.000000000 +0100 +++ new/yast2-firstboot-2.19.1/VERSION 2010-01-07 15:12:34.000000000 +0100 @@ -1 +1 @@ -2.19.0 +2.19.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/configure new/yast2-firstboot-2.19.1/configure --- old/yast2-firstboot-2.19.0/configure 2009-12-22 13:18:56.000000000 +0100 +++ new/yast2-firstboot-2.19.1/configure 2010-01-07 15:15:10.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-firstboot 2.19.0. +# Generated by GNU Autoconf 2.63 for yast2-firstboot 2.19.1. # # Report bugs to http://bugs.opensuse.org/. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-firstboot' PACKAGE_TARNAME='yast2-firstboot' -PACKAGE_VERSION='2.19.0' -PACKAGE_STRING='yast2-firstboot 2.19.0' +PACKAGE_VERSION='2.19.1' +PACKAGE_STRING='yast2-firstboot 2.19.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1282,7 +1282,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -`configure' configures yast2-firstboot 2.19.0 to adapt to many kinds of systems. +`configure' configures yast2-firstboot 2.19.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1353,7 +1353,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-firstboot 2.19.0:";; + short | recursive ) echo "Configuration of yast2-firstboot 2.19.1:";; esac cat <<_ACEOF @@ -1433,7 +1433,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -yast2-firstboot configure 2.19.0 +yast2-firstboot configure 2.19.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1447,7 +1447,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-firstboot $as_me 2.19.0, which was +It was created by yast2-firstboot $as_me 2.19.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2427,7 +2427,7 @@ # Define the identity of the package. PACKAGE='yast2-firstboot' - VERSION='2.19.0' + VERSION='2.19.1' cat >>confdefs.h <<_ACEOF @@ -2549,7 +2549,7 @@ -VERSION="2.19.0" +VERSION="2.19.1" RPMNAME="yast2-firstboot" MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>" @@ -3610,7 +3610,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-firstboot $as_me 2.19.0, which was +This file was extended by yast2-firstboot $as_me 2.19.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3660,7 +3660,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\ -yast2-firstboot config.status 2.19.0 +yast2-firstboot config.status 2.19.1 configured by $0, generated by GNU Autoconf 2.63, with options \"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\""`$]/\\&/g'`\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/configure.in new/yast2-firstboot-2.19.1/configure.in --- old/yast2-firstboot-2.19.0/configure.in 2009-12-22 13:18:53.000000000 +0100 +++ new/yast2-firstboot-2.19.1/configure.in 2010-01-07 15:15:07.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-firstboot, 2.19.0, http://bugs.opensuse.org/, yast2-firstboot) +AC_INIT(yast2-firstboot, 2.19.1, http://bugs.opensuse.org/, yast2-firstboot) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.0" +VERSION="2.19.1" RPMNAME="yast2-firstboot" MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/doc/firstboot-section_mod.xml new/yast2-firstboot-2.19.1/doc/firstboot-section_mod.xml --- old/yast2-firstboot-2.19.0/doc/firstboot-section_mod.xml 2009-07-07 10:05:20.000000000 +0200 +++ new/yast2-firstboot-2.19.1/doc/firstboot-section_mod.xml 2010-01-06 15:07:40.000000000 +0100 @@ -143,6 +143,10 @@ </para> <para> + To show two license texts in one dialog (typically the one from vendor and one from Novell), use 'firstboot_license_novell' step in your firstboot.xml file. This client will use the license texts specified by both FIRSTBOOT_LICENSE_DIR and FIRSTBOOT_NOVELL_LICENSE_DIR. + </para> + + <para> If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead of inst_finish. The recommended way of customizing the congratulate text is specifying it in the firstboot.xml control file. </para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/src/Makefile.am new/yast2-firstboot-2.19.1/src/Makefile.am --- old/yast2-firstboot-2.19.0/src/Makefile.am 2009-10-27 13:30:39.000000000 +0100 +++ new/yast2-firstboot-2.19.1/src/Makefile.am 2010-01-06 14:14:12.000000000 +0100 @@ -11,6 +11,7 @@ firstboot_language_keyboard.ycp \ firstboot_timezone.ycp \ firstboot_license.ycp \ + firstboot_licenses.ycp \ firstboot_welcome.ycp \ firstboot_ssh.ycp \ firstboot_keyboard.ycp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/src/Makefile.in new/yast2-firstboot-2.19.1/src/Makefile.in --- old/yast2-firstboot-2.19.0/src/Makefile.in 2009-12-22 13:18:57.000000000 +0100 +++ new/yast2-firstboot-2.19.1/src/Makefile.in 2010-01-07 15:15:10.000000000 +0100 @@ -247,6 +247,7 @@ firstboot_language_keyboard.ycp \ firstboot_timezone.ycp \ firstboot_license.ycp \ + firstboot_licenses.ycp \ firstboot_welcome.ycp \ firstboot_ssh.ycp \ firstboot_keyboard.ycp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/src/control/firstboot.xml new/yast2-firstboot-2.19.1/src/control/firstboot.xml --- old/yast2-firstboot-2.19.0/src/control/firstboot.xml 2009-11-03 11:06:52.000000000 +0100 +++ new/yast2-firstboot-2.19.1/src/control/firstboot.xml 2010-01-06 15:11:32.000000000 +0100 @@ -104,6 +104,11 @@ <name>firstboot_welcome</name> </module> <module> + <label>License Agreements</label> + <enabled config:type="boolean">false</enabled> + <name>firstboot_licenses</name> + </module> + <module> <label>License Agreement</label> <enabled config:type="boolean">true</enabled> <name>firstboot_license_novell</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/src/firstboot_keyboard.ycp new/yast2-firstboot-2.19.1/src/firstboot_keyboard.ycp --- old/yast2-firstboot-2.19.0/src/firstboot_keyboard.ycp 2009-12-22 13:03:57.000000000 +0100 +++ new/yast2-firstboot-2.19.1/src/firstboot_keyboard.ycp 2009-12-22 13:27:36.000000000 +0100 @@ -3,7 +3,7 @@ * Author : Jiri Suchomel <jsuchome@suse.cz> * Purpose : Firstboot configuratiuon of keyboard * - * $Id: firstboot_keyboard.ycp 58220 2009-07-30 13:46:08Z jsuchome $ + * $Id: firstboot_keyboard.ycp 60169 2009-12-22 12:27:28Z jsuchome $ */ { textdomain "country"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/src/firstboot_language_keyboard.ycp new/yast2-firstboot-2.19.1/src/firstboot_language_keyboard.ycp --- old/yast2-firstboot-2.19.0/src/firstboot_language_keyboard.ycp 2009-07-30 15:46:14.000000000 +0200 +++ new/yast2-firstboot-2.19.1/src/firstboot_language_keyboard.ycp 2010-01-06 17:19:38.000000000 +0100 @@ -137,13 +137,9 @@ Language::Set (language); } // Check and set CJK languages - if (ret == `language && Language::CJKLanguage (language) && - !Language::CJKLanguage (preselected) && Language::GetTextMode ()) + if (ret == `language && Language::SwitchToEnglishIfNeeded (true)) { - // popup message (user selected CJK language in text mode) - Popup::Message (_("The selected language cannot be used in text mode. English is used for -installation, but the selected language will be used for the new system.")); - Language::WfmSetGivenLanguage ("en_US"); + y2debug ("UI switched to en_US"); } else if (ret == `language) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/src/firstboot_licenses.ycp new/yast2-firstboot-2.19.1/src/firstboot_licenses.ycp --- old/yast2-firstboot-2.19.0/src/firstboot_licenses.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-firstboot-2.19.1/src/firstboot_licenses.ycp 2010-01-06 15:04:19.000000000 +0100 @@ -0,0 +1,49 @@ +/* + * Purpose : Display 2 license texts (probably from vendor and Novell) during firstboot configuration + * + * $Id: firstboot_license.ycp 57028 2009-04-29 10:58:09Z lslezak $ + */ + +{ + textdomain "firstboot"; + + import "Misc"; + import "GetInstArgs"; + import "ProductFeatures"; + + + any result = nil; + + map args = GetInstArgs::argmap(); + + // default directory with Novell license texts + string default_dir = ProductFeatures::GetStringFeature ("globals", + "base_product_license_directory"); + + string dir1 = Misc::SysconfigRead ( + .sysconfig.firstboot.FIRSTBOOT_LICENSE_DIR, "/etc/YaST2"); + string dir2 = Misc::SysconfigRead ( + .sysconfig.firstboot.FIRSTBOOT_NOVELL_LICENSE_DIR, default_dir); + + if (dir2 != dir1) + args["directories"] = [ dir1, dir2]; + else + args["directories"] = [ dir1 ]; + + args["action"] = Misc::SysconfigRead ( + .sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort"); + + y2milestone("inst_license options: %1", args); + + result = WFM::CallFunction( "inst_license", [ args ] ); + + if (result == `halt) + { + UI::CloseDialog(); + y2milestone("Halting the system..."); + SCR::Execute(.target.bash, "/sbin/halt"); + } + + return result; + +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org