Hello community,
here is the log from the commit of package yast2-installation
checked in at Thu Jan 31 12:16:23 CET 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-01-30 15:33:04.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2008-01-31 11:19:26.000000000 +0100
@@ -1,0 +2,8 @@
+Thu Jan 31 11:14:46 CET 2008 - locilka@suse.cz
+
+- Added docu. for *_finish scripts (needed for FATE #302980).
+- Welcome dialog can newly show the license according to the just
+ selected language and also show other lozalizations if needed.
+- 2.16.13
+
+-------------------------------------------------------------------
@@ -4,0 +13 @@
+- 2.16.12
Old:
----
yast2-installation-2.16.12.tar.bz2
New:
----
yast2-installation-2.16.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.m12177/_old 2008-01-31 12:16:17.000000000 +0100
+++ /var/tmp/diff_new_pack.m12177/_new 2008-01-31 12:16:17.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.16.12)
+# spec file for package yast2-installation (Version 2.16.13)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.16.12
+Version: 2.16.13
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.12.tar.bz2
+Source0: yast2-installation-2.16.13.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# Mode::live_installation
@@ -31,7 +31,8 @@
# Newly created RPM
Requires: yast2-country-data >= 2.16.3
# New System-selection data and API DefaultDesktop module
-Requires: yast2-packager >= 2.16.17
+# New API in ProductLicense
+Requires: yast2-packager >= 2.16.18
# Only in inst-sys
# Requires: yast2-runlevel
# Requires: yast2-network
@@ -70,12 +71,12 @@
Summary: YaST2 - Installation Parts
%package devel-doc
-Version: 2.16.12
+Version: 2.16.13
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.12.tar.bz2
+Source0: yast2-installation-2.16.13.tar.bz2
Prefix: /usr
Requires: yast2-installation >= 2.15.34
PreReq: %fillup_prereq
@@ -108,7 +109,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.16.12
+%setup -n yast2-installation-2.16.13
%build
%{prefix}/bin/y2tool y2autoconf
@@ -173,9 +174,16 @@
%doc %{prefix}/share/doc/packages/yast2-installation
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
+
%changelog
+* Thu Jan 31 2008 locilka@suse.cz
+- Added docu. for *_finish scripts (needed for FATE #302980).
+- Welcome dialog can newly show the license according to the just
+ selected language and also show other lozalizations if needed.
+- 2.16.13
* Wed Jan 30 2008 aschnell@suse.de
- Use icewm instead of fvwm during installation (bnc #357240)
+- 2.16.12
* Wed Jan 30 2008 fehr@suse.de
- Add installation step for disk partitioning between time zone
and software selection
++++++ yast2-installation-2.16.12.tar.bz2 -> yast2-installation-2.16.13.tar.bz2 ++++++
++++ 2741 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.12/configure.in new/yast2-installation-2.16.13/configure.in
--- old/yast2-installation-2.16.12/configure.in 2008-01-30 15:32:22.000000000 +0100
+++ new/yast2-installation-2.16.13/configure.in 2008-01-14 13:56:46.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.16.12, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.16.9, http://bugs.opensuse.org/, yast2-installation)
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.16.12"
+VERSION="2.16.9"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.12/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.16.13/src/clients/inst_complex_welcome.ycp
--- old/yast2-installation-2.16.12/src/clients/inst_complex_welcome.ycp 2008-01-30 15:26:00.000000000 +0100
+++ new/yast2-installation-2.16.13/src/clients/inst_complex_welcome.ycp 2008-01-30 10:29:36.000000000 +0100
@@ -40,8 +40,9 @@
import "Wizard";
import "Icon";
import "InstData";
+ import "ProductLicense";
- string language = Language::language;
+ string language = Language::language;
/**
* check if selected language has support on media (F301238)
@@ -69,30 +70,6 @@
}
}
-
-/*
- define void update_adapt_term () {
-
- string kb = Keyboard::GetKeyboardForLanguage (language, "english-us");
- string tz = Timezone::GetTimezoneForLanguage (language, "US/Mountain");
-
- string kbd_name = Keyboard::Selection ()[kb]:"";
- string tmz_name = Timezone::GetTimezoneCountry (tz);
-
- UI::ReplaceWidget (`id(`rpadapt), `VBox (
- `Left (`CheckBox (`id (`adapt_kbd),
- // check box label (%1 is keyboard layout name)
- sformat(_("Adapt &Keyboard Layout to %1"),kbd_name))),
- `Left (`CheckBox (`id (`adapt_tmz),
- // check box label (%1 is country name)
- sformat (_("Adapt &Time Zone to %1"), tmz_name)))
- ));
-
- UI::ChangeWidget(`id(`adapt_kbd),`Enabled, kb != Keyboard::current_kbd);
- UI::ChangeWidget(`id(`adapt_tmz),`Enabled, tz != Timezone::timezone);
- }
-*/
-
// ------------------------------------- main part of the client -----------
map argmap = GetInstArgs::argmap();
@@ -106,17 +83,6 @@
string preselected = Language::preselected;
- if (preselected != "en_US" && set_default)
- {
- if (ProductFeatures::GetBooleanFeature ("globals", "skip_language_dialog"))
- {
- y2milestone("Skipping language dialog, Language changed to %1",preselected);
- check_languages_support (preselected);
- Language::selection_skipped = true;
- return `auto;
- }
- }
-
list<string>languages = splitstring (Language::languages, ",");
// filter the primary language from the list of secondary ones:
@@ -130,7 +96,7 @@
// set up selection list with default item
- boolean use_ascii = Language::GetTextMode ();
+ boolean text_mode = Language::GetTextMode ();
/* ----------------------------------------------------------------------
* Build dialog
@@ -149,7 +115,7 @@
string key = lang_info [1]:lang_code;
return $[
key : [
- lang_info[use_ascii ? 1 : 0]:"",
+ lang_info[text_mode ? 1 : 0]:"",
lang_code,
lang_info[2]:key
]
@@ -228,14 +194,43 @@
`HSquash (
`VBox (
`Left (`Label (`opt(`boldFont), _("License Agreement"))),
- `Left (`Label (_("License agreement is missing here.
-It will be added soon."))),
- `Left (`CheckBox (`id (`license_agreement), `opt (`notify), _("I Do &Agree to the License Terms."), InstData::product_license_accepted))
+ `HSquash(`MinSize (
+ 60,
+ (text_mode ? 9:13),
+ `Left (`ReplacePoint (`id (`base_license_rp), `Empty()))
+ )),
+ `VSpacing (text_mode ? 0.1 : 0.5),
+ `HBox (
+ `Left (`CheckBox (
+ // TRANSLATORS: check-box
+ `id (`license_agreement), `opt (`notify), _("I Do &Agree to the License Terms."), InstData::product_license_accepted
+ )),
+ `VStretch (),
+ // TRANSLATORS: button label
+ `Right (`PushButton (`id (`show_fulscreen_license), _("Show In Full-Screen...")))
+ )
)
),
`VWeight (3, `VStretch())
);
+ term FullScreenLicenseDialog () {
+ return `VBox (
+ `Left (`HBox (
+ Icon::Simple ("yast-license"),
+ // TRANSLATORS: dialog caption
+ `Heading (_("License Agreement"))
+ )),
+ `VSpacing (text_mode ? 0.1 : 0.5),
+ `HSpacing (60),
+ `MinHeight (
+ (text_mode ? 20 : 25),
+ `ReplacePoint (`id (`full_screen_license_rp), `Empty())
+ ),
+ `PushButton (`id (`close), Label::OKButton())
+ );
+ }
+
string help_text = "";
// help text (language dependent packages) - at the end of help
string packages_help = _("<p>
@@ -412,6 +407,13 @@
return false;
}
+ ProductLicense::ShowLicenseInInstallation (`base_license_rp);
+
+ // bugzilla #206706
+ if (Mode::autoinst()) {
+ return `auto;
+ }
+
while (true) {
ret = UI::UserInput();
y2milestone ("UserInput() returned %1", ret);
@@ -450,6 +452,10 @@
}
if (ret == `next) break;
+ } else if (ret == `show_fulscreen_license) {
+ UI::OpenDialog (FullScreenLicenseDialog());
+ ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp);
+ UI::CloseDialog();
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.12/VERSION new/yast2-installation-2.16.13/VERSION
--- old/yast2-installation-2.16.12/VERSION 2008-01-30 15:26:01.000000000 +0100
+++ new/yast2-installation-2.16.13/VERSION 2008-01-31 11:21:47.000000000 +0100
@@ -1 +1 @@
-2.16.12
+2.16.13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org