Hello community,
here is the log from the commit of package yast2-product-creator for
openSUSE:Factory
checked in at Fri Mar 4 15:48:20 CET 2011.
--------
--- yast2-product-creator/yast2-product-creator.changes 2010-11-09
14:41:03.000000000 +0100
+++
/mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes
2011-03-04 14:28:54.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Mar 4 14:26:18 CET 2011 - [email protected]
+
+- strip UTF-8 ending from locale string (bnc#675101)
+- allow live iso creation only for x86/x86_64 (bnc#675101
+- 2.21.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.20.3.tar.bz2
New:
----
yast2-product-creator-2.21.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.MaqllQ/_old 2011-03-04 15:47:16.000000000 +0100
+++ /var/tmp/diff_new_pack.MaqllQ/_new 2011-03-04 15:47:16.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-product-creator (Version 2.20.3)
+# spec file for package yast2-product-creator
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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
@@ -19,11 +19,11 @@
Name: yast2-product-creator
-Version: 2.20.3
+Version: 2.21.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.20.3.tar.bz2
+Source0: yast2-product-creator-2.21.0.tar.bz2
Prefix: /usr
@@ -62,7 +62,7 @@
XEN images etc.), based on existing installation sources.
%prep
-%setup -n yast2-product-creator-2.20.3
+%setup -n yast2-product-creator-2.21.0
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-product-creator-2.20.3.tar.bz2 ->
yast2-product-creator-2.21.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.20.3/VERSION
new/yast2-product-creator-2.21.0/VERSION
--- old/yast2-product-creator-2.20.3/VERSION 2010-11-09 14:38:29.000000000
+0100
+++ new/yast2-product-creator-2.21.0/VERSION 2011-03-04 14:26:34.000000000
+0100
@@ -1 +1 @@
-2.20.3
+2.21.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.20.3/src/Kiwi.ycp
new/yast2-product-creator-2.21.0/src/Kiwi.ycp
--- old/yast2-product-creator-2.20.3/src/Kiwi.ycp 2010-11-09
14:37:24.000000000 +0100
+++ new/yast2-product-creator-2.21.0/src/Kiwi.ycp 2011-03-04
14:27:25.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for kiwi configuration, input and output functions.
* Authors: Jiri Suchomel <[email protected]>
*
- * $Id: Kiwi.ycp 61923 2010-04-29 16:03:38Z jsuchome $
+ * $Id: Kiwi.ycp 63513 2011-03-04 13:27:24Z jsuchome $
*/
{
module "Kiwi";
@@ -276,6 +276,14 @@
ret["preferences",0,"defaultdestination",0,content_key]:"";
}
+ if (haskey (ret["preferences",0]:$[], "locale"))
+ {
+ // remove .UTF-8 endings from locale (bnc#675101)
+ string lang = get_preferences (ret, "locale", "");
+ list<string> split = splitstring (lang, ".");
+ ret = save_preferences (ret, "locale", split[0]:lang);
+ }
+
return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-product-creator-2.20.3/src/data/kiwi_templates/iso/config.xml
new/yast2-product-creator-2.21.0/src/data/kiwi_templates/iso/config.xml
--- old/yast2-product-creator-2.20.3/src/data/kiwi_templates/iso/config.xml
2010-01-06 13:51:08.000000000 +0100
+++ new/yast2-product-creator-2.21.0/src/data/kiwi_templates/iso/config.xml
2011-03-04 14:25:34.000000000 +0100
@@ -17,7 +17,7 @@
<boot-theme>openSUSE</boot-theme>
<rpm-check-signatures>false</rpm-check-signatures>
<rpm-force>false</rpm-force>
- <locale>en_US.UTF-8</locale>
+ <locale>en_US</locale>
<oem-swap>false</oem-swap>
<oem-boot-title>USB</oem-boot-title>
<rpm-excludedocs>false</rpm-excludedocs>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.20.3/src/kiwi_dialogs.ycp
new/yast2-product-creator-2.21.0/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.20.3/src/kiwi_dialogs.ycp 2010-11-09
14:37:24.000000000 +0100
+++ new/yast2-product-creator-2.21.0/src/kiwi_dialogs.ycp 2011-03-04
14:27:25.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel <[email protected]>
*
- * $Id: kiwi_dialogs.ycp 62349 2010-08-05 11:18:20Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 63513 2011-03-04 13:27:24Z jsuchome $
*/
{
textdomain "product-creator";
@@ -529,6 +529,14 @@
*/
define void StorePreferences (string key, map event) {
string val = (string) UI::QueryWidget (`id(key), `Value);
+
+ // split .UTF-8 endings from locale (bnc#675101)
+ if (key == "locale")
+ {
+ list<string> split = splitstring (val, ".");
+ val = split[0]:val;
+ UI::ChangeWidget (`id (key), `Value, val);
+ }
if (val == "" && haskey (KiwiConfig["preferences",0]:$[], key))
{
KiwiConfig["preferences",0] =
@@ -2122,14 +2130,22 @@
list basic_type_items = [
// combo box item
- `item (`id ("iso"), _("Live ISO Image"), kiwi_task == "iso"),
- // combo box item
`item (`id ("xen"), _("Xen Image"), kiwi_task == "xen"),
// combo box item
`item (`id ("usb"), _("USB Stick Image"), kiwi_task == "usb"),
// combo box item
`item (`id ("vmx"), _("Virtual Disk Image"), kiwi_task == "vmx")
];
+
+ // build Live iso only for x86_64 and i386 (bnc#675101)
+ if (Arch::architecture () == "x86_64" || ProductCreator::GetArch () ==
"i386")
+ {
+ basic_type_items = prepend (basic_type_items,
+ // combo box item
+ `item (`id ("iso"), _("Live ISO Image"), kiwi_task == "iso")
+ );
+ }
+
map task2label = $[
// combo box item
"pxe" : _("Network Boot Image"),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.20.3/src/routines.ycp
new/yast2-product-creator-2.21.0/src/routines.ycp
--- old/yast2-product-creator-2.20.3/src/routines.ycp 2010-07-29
16:44:35.000000000 +0200
+++ new/yast2-product-creator-2.21.0/src/routines.ycp 2010-11-09
14:40:40.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Miscelanous functions for configuration of product-creator.
* Authors: Anas Nashif <[email protected]>
*
- * $Id: routines.ycp 60523 2010-01-25 19:02:45Z jsuchome $
+ * $Id: routines.ycp 62770 2010-11-09 13:40:39Z jsuchome $
*/
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
