From 7d9c36278d47bd55f75ecd7f4deec9af7f35a25d Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Tue, 25 Jan 2005 17:38:21 +0000 Subject: Use the new --gui option to urpmi for the drakxtools to ask for media change; update the dependency of drakxtools on urpmi version accordingly. Remove dependency on gurpmi. --- perl-install/do_pkgs.pm | 2 +- perl-install/drakxtools.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm index bf48c081d..4bb6842a8 100644 --- a/perl-install/do_pkgs.pm +++ b/perl-install/do_pkgs.pm @@ -173,7 +173,7 @@ sub install { $do->in->suspend; log::explanations("installed packages @l"); #- --expect-install added in urpmi 4.6.11 - my $ret = system('urpmi', '--allow-medium-change', '--auto', '--no-verify-rpm', '--expect-install', @l) == 0; + my $ret = system('urpmi', '--allow-medium-change', '--auto', '--no-verify-rpm', '--gui', '--expect-install', @l) == 0; $do->in->resume; $ret; } diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec index 45a7405b8..d0d196c71 100644 --- a/perl-install/drakxtools.spec +++ b/perl-install/drakxtools.spec @@ -6,7 +6,7 @@ Url: http://www.mandrakelinux.com/en/drakx.php3 Source0: %name-%version.tar.bz2 License: GPL Group: System/Configuration/Other -Requires: %{name}-newt = %version-%release, perl-Gtk2 >= 1.040-1mdk, perl-Glib >= 1.040-1mdk, /usr/X11R6/bin/xtest, font-tools, usermode >= 1.63-5mdk, perl-MDK-Common >= 1.1.18-1mdk, gurpmi, mandrake-doc-common >= 9.2-5mdk +Requires: %{name}-newt = %version-%release, perl-Gtk2 >= 1.040-1mdk, perl-Glib >= 1.040-1mdk, /usr/X11R6/bin/xtest, font-tools, usermode >= 1.63-5mdk, perl-MDK-Common >= 1.1.18-1mdk, mandrake-doc-common >= 9.2-5mdk Requires: foomatic-db-engine Conflicts: drakconf < 10.1-0.6mdk Conflicts: rpmdrake < 2.1-29mdk @@ -22,7 +22,7 @@ Obsoletes: draksec %package newt Summary: The drakxtools (XFdrake, diskdrake, keyboarddrake, mousedrake...) Group: System/Configuration/Other -Requires: perl-base >= 2:5.8.6-1mdk, urpmi >= 4.6.11, modutils >= 2.3.11, usermode-consoleonly >= 1.44-4mdk, msec >= 0.38-5mdk +Requires: perl-base >= 2:5.8.6-1mdk, urpmi >= 4.6.13, modutils >= 2.3.11, usermode-consoleonly >= 1.44-4mdk, msec >= 0.38-5mdk Requires: %{name}-backend = %version-%release Requires: netprofile Obsoletes: diskdrake kbdconfig mouseconfig printtool setuptool drakfloppy -- cgit v1.2.1