Author: locilka Date: Mon Nov 5 12:25:39 2007 New Revision: 41776 URL: http://svn.opensuse.org/viewcvs/yast?rev=41776&view=rev Log: Fixed for build Added: trunk/dirinstall/doc/ Modified: trunk/dirinstall/src/modules/DirInstall.ycp trunk/dirinstall/src/modules/Makefile.am trunk/dirinstall/yast2-dirinstall.spec.in Modified: trunk/dirinstall/src/modules/DirInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/modules/DirInstall.ycp?rev=41776&r1=41775&r2=41776&view=diff ============================================================================== --- trunk/dirinstall/src/modules/DirInstall.ycp (original) +++ trunk/dirinstall/src/modules/DirInstall.ycp Mon Nov 5 12:25:39 2007 @@ -8,17 +8,17 @@ * */ { -textdomain "packager"; +textdomain "dirinstall"; + module "DirInstall"; import "Mode"; import "Stage"; import "HTML"; import "ProductControl"; import "String"; +import "Installation"; global boolean runme_at_boot = false; -string target = "/var/tmp/dirinstall"; - global boolean makeimage = false; global string image_dir = ""; global string image_name = ""; @@ -27,8 +27,6 @@ global string dirinstall_control_file = "/usr/share/YaST2/control/dirinstall.xml"; -global boolean installing_into_dir = false; - list filesystems = [ ["/proc", "proc", "proc" ], ["/sys", "sysfs", "sysfs" ], @@ -45,16 +43,16 @@ global void SetTarget(string tgt) { - if (target != tgt) + if (Installation::dirinstall_target != tgt) { - target = tgt; + Installation::dirinstall_target = tgt; target_time = time(); } } global string GetTarget() { - return target; + return Installation::dirinstall_target; } global void InitProductControl () { @@ -67,7 +65,7 @@ y2error("control file %1 not found", ProductControl::custom_control_file ); } } else { - installing_into_dir =false; + Installation::dirinstall_installing_into_dir =false; } @@ -83,7 +81,7 @@ string color = "red"; list<string> tmp = []; // Proposal for dirinstall installation - tmp = add (tmp, sformat (_("Target Directory: %1"), HTML::Colorize(DirInstall::target, color))); + tmp = add (tmp, sformat (_("Target Directory: %1"), HTML::Colorize(Installation::dirinstall_target, color))); // Proposal for backup during update tmp = add (tmp, sformat (_("Run YaST and SuSEconfig at First Boot: %1"), HTML::Colorize(DirInstall::runme_at_boot @@ -103,7 +101,7 @@ string mp = descr[0]:""; string dev = descr[1]:""; string type = descr[2]:""; - mp = target + mp; + mp = Installation::dirinstall_target + mp; WFM::Execute (.local.bash, sformat ("test -d '%1' || mkdir -p '%1'", String::Quote (mp))); WFM::Execute (.local.bash, sformat ("/bin/mount -t %1 %2 '%3'", type, dev, String::Quote (mp))); Modified: trunk/dirinstall/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/modules/Makefile.am?rev=41776&r1=41775&r2=41776&view=diff ============================================================================== --- trunk/dirinstall/src/modules/Makefile.am (original) +++ trunk/dirinstall/src/modules/Makefile.am Mon Nov 5 12:25:39 2007 @@ -5,9 +5,4 @@ module_DATA = $(wildcard [A-Z]*.ycp [A-Z]*.pm) EXTRA_DIST = $(module_DATA) -packager: - ln -sf ../include packager - -ycpchook = packager - include $(top_srcdir)/Makefile.am.common Modified: trunk/dirinstall/yast2-dirinstall.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/yast2-dirinstall.spec.in?rev=41776&r1=41775&r2=41776&view=diff ============================================================================== --- trunk/dirinstall/yast2-dirinstall.spec.in (original) +++ trunk/dirinstall/yast2-dirinstall.spec.in Mon Nov 5 12:25:39 2007 @@ -1,8 +1,17 @@ @HEADER-COMMENT@ @HEADER@ -Requires: yast2 -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +# Installation::dirinstall_target +Requires: yast2 >= 2.16.7 +Requires: yast2 yast2-country yast2-mouse yast2-packager yast2-runlevel + +BuildRequires: yast2 >= 2.16.7 +BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite +#BuildRequires: docbook-xsl-stylesheets doxygen libxslt sgml-skel + +Provides: /usr/share/YaST2/clients/dirinstall.ycp +# Package-split +Conflicts: yast2-packager < 2.16.3 BuildArchitectures: noarch @@ -23,9 +32,10 @@ %defattr(-,root,root) %dir @yncludedir@/dirinstall @yncludedir@/dirinstall/* -@clientdir@/dirinstall.ycp -@clientdir@/dirinstall_*.ycp -@moduledir@/Dirinstall.* -@moduledir@/Dirinstall2.* -@desktopdir@/dirinstall.desktop +@yncludedir@/packager/* +@clientdir@/*.ycp +@moduledir@/* +@desktopdir@/*.desktop +%dir /usr/share/YaST2/control +/usr/share/YaST2/control/*.xml %doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org