Author: locilka Date: Fri Mar 14 12:24:29 2008 New Revision: 45454 URL: http://svn.opensuse.org/viewcvs/yast?rev=45454&view=rev Log: - Adjusted to new API for disabled modules in ProductControl. - Adjusted RPM dependencies. Modified: trunk/autoinstallation/autoyast2.spec.in trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstSoftware.ycp trunk/autoinstallation/src/modules/Profile.ycp Modified: trunk/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/autoyast2.spec.in?rev=45454&r1=45453&r2=45454&view=diff ============================================================================== --- trunk/autoinstallation/autoyast2.spec.in (original) +++ trunk/autoinstallation/autoyast2.spec.in Fri Mar 14 12:24:29 2008 @@ -2,8 +2,10 @@ @HEADER@ BuildRequires: java2-devel-packages yast2-mouse yast2-transfer yast2-update yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country -BuildRequires: yast2 >= 2.16.8 +# API for Disabled Modules (ProductControl) +BuildRequires: yast2 >= 2.16.36 +Requires: yast2 >= 2.16.36 Requires: yast2-core yast2-xml libxslt yast2-installation Requires: autoyast2-installation = %{version} Requires: yast2-schema yast2 yast2-country yast2-storage @@ -27,9 +29,8 @@ Version: @VERSION@ Summary: YaST2 - Auto-Installation: Installation Modules Group: System/YaST -# Some variables were moved from AutoinstStorage, AutoinstGeneral, and AutoinstSoftware -# to AutoinstData (yast2.rpm) to break cyclic dependencies. -Requires: yast2 >= 2.16.8 +# API for Disabled Modules (ProductControl) +Requires: yast2 >= 2.16.36 Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer yast2-update Provides: yast2-trans-autoinst Obsoletes: yast2-trans-autoinst Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=45454&r1=45453&r2=45454&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Mar 14 12:24:29 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 14 12:20:44 CET 2008 - locilka@suse.cz + +- Adjusted to new API for disabled modules in ProductControl. +- Adjusted RPM dependencies. + +------------------------------------------------------------------- Thu Mar 13 15:37:31 CET 2008 - ug@suse.de - <device> autodetection for RAID added (bnc#367734) Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstSoftware.ycp?rev=45454&r1=45453&r2=45454&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstSoftware.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Fri Mar 14 12:24:29 2008 @@ -340,8 +340,8 @@ if (imaging) { if( ! image["run_kickoff"]:false ) - ProductControl::DisabledModules=add(ProductControl::DisabledModules, "kickoff"); - ProductControl::DisabledModules=add(ProductControl::DisabledModules, "rpmcopy"); + ProductControl::DisableModule ("kickoff"); + ProductControl::DisableModule ("rpmcopy"); return true; } Modified: trunk/autoinstallation/src/modules/Profile.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Profile.ycp?rev=45454&r1=45453&r2=45454&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/Profile.ycp (original) +++ trunk/autoinstallation/src/modules/Profile.ycp Fri Mar 14 12:24:29 2008 @@ -202,7 +202,7 @@ // should not be needed anymore with new libsax //if (!current["x11", "configure_x11"]:false) - // ProductControl::DisabledModules=add(ProductControl::DisabledModules, "x11"); + // ProductControl::DisableModule ("x11"); // raise the network immediately after configuring it if( haskey(current, "networking") && ! haskey(current["networking"]:$[], "start_immediately") ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org