Author: jsuchome Date: Mon Apr 7 10:55:06 2008 New Revision: 46167 URL: http://svn.opensuse.org/viewcvs/yast?rev=46167&view=rev Log: - offered SLE10SP2 products as a base for new AddOn (bnc#377091) - fixed typo (bnc#376702) - 2.16.6 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/add-on-creator.ycp trunk/add-on-creator/src/complex.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=46167&... ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Mon Apr 7 10:55:06 2008 @@ -1 +1 @@ -2.16.5 +2.16.6 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add-... ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Mon Apr 7 10:55:06 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 7 10:43:35 CEST 2008 - jsuchome@suse.cz + +- offered SLE10SP2 products as a base for new AddOn (bnc#377091) +- fixed typo (bnc#376702) +- 2.16.6 + +------------------------------------------------------------------- Sun Mar 30 20:44:45 CEST 2008 - jsuchome@suse.cz - merged proofread texts Modified: trunk/add-on-creator/src/add-on-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/add-on-creator... ============================================================================== --- trunk/add-on-creator/src/add-on-creator.ycp (original) +++ trunk/add-on-creator/src/add-on-creator.ycp Mon Apr 7 10:55:06 2008 @@ -422,7 +422,7 @@ CommandLine::Print (sformat (_("(%1) Product Name: %2"), i, cont["PRODUCT"]:"")); // command line summary - CommandLine::Print (sformat (_("\tVersio: %1"), cont["VERSION"]:"")); + CommandLine::Print (sformat (_("\tVersion: %1"), cont["VERSION"]:"")); // command line summary CommandLine::Print (sformat (_("\tInput directory: %1"), add_on["rpm_path"]:"")); Modified: trunk/add-on-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?re... ============================================================================== --- trunk/add-on-creator/src/complex.ycp (original) +++ trunk/add-on-creator/src/complex.ycp Mon Apr 7 10:55:06 2008 @@ -380,26 +380,30 @@ `VSpacing (0.4), `RadioButtonGroup (`id(`rd), `Left(`HVSquash(`VBox ( - `Left (`RadioButton(`id(`sles10), `opt (`notify), - // radio button label - _("SUSE Linux &Enterprise Server 10"), - requires == "sles-release-10")), `Left (`RadioButton(`id(`sles10sp1), `opt (`notify), // radio button label _("SUSE &Linux Enterprise Server 10 SP1"), requires == "product:SUSE_SLES = 10.1")), - `Left (`RadioButton(`id(`sled10), `opt (`notify), + `Left (`RadioButton(`id(`sles10sp2), `opt (`notify), // radio button label - _("SUSE Linux Enterprise &Desktop 10"), - requires == "sled-release-10")), + _("SUSE &Linux Enterprise Server 10 SP2"), + requires == "product:SUSE_SLES = 10.2")), `Left (`RadioButton(`id(`sled10sp1), `opt (`notify), // radio button label _("SUSE L&inux Enterprise Desktop 10 SP1"), requires == "product:SUSE_SLED = 10.1")), + `Left (`RadioButton(`id(`sled10sp2), `opt (`notify), + // radio button label + _("SUSE L&inux Enterprise Desktop 10 SP2"), + requires == "product:SUSE_SLED = 10.2")), `Left (`RadioButton(`id(`sle10sp1), `opt (`notify), // radio button label _("S&USE Linux Enterprise 10 SP1"), requires == "product:SUSE_SLE = 10.1")), + `Left (`RadioButton(`id(`sle10sp2), `opt (`notify), + // radio button label + _("S&USE Linux Enterprise 10 SP2"), + requires == "product:SUSE_SLE = 10.2")), `Left (`RadioButton(`id(`opensuse11), `opt (`notify), // radio button label _("OpenSUSE &11.0"), @@ -480,28 +484,28 @@ UI::ChangeWidget (`id(`required_rpm_path), `Value, req_dir); } } - else if (ret == `sles10) { - requires = "sles-release-10"; - UI::ChangeWidget (`id(`other_val), `Enabled, false); - } else if (ret == `sles10sp1) { requires = "product:SUSE_SLES = 10.1"; UI::ChangeWidget (`id(`other_val), `Enabled, false); } - else if (ret == `sled10) { - requires = "sled-release-10"; + else if (ret == `sles10sp2) { + requires = "product:SUSE_SLES = 10.2"; UI::ChangeWidget (`id(`other_val), `Enabled, false); } else if (ret == `sled10sp1) { requires = "product:SUSE_SLED = 10.1"; UI::ChangeWidget (`id(`other_val), `Enabled, false); } + else if (ret == `sled10sp2) { + requires = "product:SUSE_SLED = 10.2"; + UI::ChangeWidget (`id(`other_val), `Enabled, false); + } else if (ret == `sle10sp1) { requires = "product:SUSE_SLE = 10.1"; UI::ChangeWidget (`id(`other_val), `Enabled, false); } - else if (ret == `suse101) { - requires = "suse-release-10.1"; + else if (ret == `sle10sp2) { + requires = "product:SUSE_SLE = 10.2"; UI::ChangeWidget (`id(`other_val), `Enabled, false); } else if (ret == `opensuse11) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org