Author: mzugec Date: Wed May 30 11:34:28 2007 New Revision: 38187 URL: http://svn.opensuse.org/viewcvs/yast?rev=38187&view=rev Log: fixed spec requirements Modified: trunk/network/package/yast2-network.changes trunk/network/src/dsl/dialogs.ycp trunk/network/yast2-network.spec.in Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=38187&r1=38186&r2=38187&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed May 30 11:34:28 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed May 30 11:34:16 CEST 2007 - mzugec@suse.cz + +- fixed spec requirements + +------------------------------------------------------------------- Tue May 29 12:56:38 CEST 2007 - mzugec@suse.cz - add Confirm::MustBeRoot to all network modules (#276478) Modified: trunk/network/src/dsl/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/dsl/dialogs.ycp?rev=38187&r1=38186&r2=38187&view=diff ============================================================================== --- trunk/network/src/dsl/dialogs.ycp (original) +++ trunk/network/src/dsl/dialogs.ycp Wed May 30 11:34:28 2007 @@ -25,6 +25,7 @@ include "network/runtime.ycp"; include "network/routines.ycp"; include "network/widgets.ycp"; +include "network/installation/dialogs.ycp"; /** * DSL device dialog @@ -119,6 +120,7 @@ ifaces = add(ifaces, interface); y2debug("ifaces=%1", ifaces); + y2internal("ifaces=%1", ifaces); ifaces = maplist(string e, (list<string>) ifaces, { return `item(`id(sformat("%1", e)), sformat("%1", e), e == interface); }); @@ -146,6 +148,11 @@ ["USERCONTROL", "STARTMODE",], widget_descr); +NetworkDevices::Read(); + map device_descr = GetDeviceDescription(Internet::device); +y2internal("device_descr %1", device_descr); +string connection_text = _("%1 - %2 (%3)"); + /* DSL dialog contents */ term contents = `HBox( `HSpacing(6), @@ -162,15 +169,20 @@ `VSpacing(0.2), `HBox( /* ComboBox label */ - `Left(`ReplacePoint(`id(`rp), `ComboBox(`id(`interface), _("&Ethernet Card"), ifaces))), +// `Left(`ReplacePoint(`id(`rp), `ComboBox(`id(`interface), _("&Ethernet Card"), ifaces))), + /* RadioButton label */ + `Left(`ReplacePoint(`id(`rp), `Label(`id(`yes), sformat(connection_text, device_descr["name"]:"", device_descr["type"]:"", device_descr["ipaddr"]:_("No IP address assigned"))))), + // push button label + `Right(`PushButton(`id(`net_expert), _("&Change Device"))) /* TextEntry label */ // `TextEntry(`id(`interface), _("&Ethernet Card"), interface), - `HSpacing(1), +// `HSpacing(1), +/* `VBox( `Label(""), - /* PushButton label */ `PushButton(`id(`lan), _("&Configure Network Cards")) ) +*/ ), `VSpacing(0.2), /* TextEntry label */ Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?rev=38187&r1=38186&r2=38187&view=diff ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Wed May 30 11:34:28 2007 @@ -5,7 +5,8 @@ BuildRequires: pkgconfig perl-XML-Writer rpm BuildRequires: update-desktop-files BuildRequires: yast2-devtools yast2-testsuite yast2 -BuildRequires: yast2-country yast2-installation +BuildRequires: yast2-country +BuildRequires: yast2-installation >= 2.15.27 # String::Random # Linuxrc::display_ip -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org