From 66b01eddc30a65034b272fe7b7af2afd2bf1429b Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Tue, 11 Feb 2003 17:03:57 +0000 Subject: fixes error "source not selected" (#966 and its army of duplicates) --- rpmdrake | 11 ++++++----- rpmdrake.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/rpmdrake b/rpmdrake index 319dc846..b79354fe 100755 --- a/rpmdrake +++ b/rpmdrake @@ -239,7 +239,7 @@ sub run_treeview_dialog { my (undef, $size_free) = MDK::Common::System::df('/usr'); $::noBorder = 1; - $w = ugtk2->new(N("rpmdrake")." 9.0"); + $w = ugtk2->new(N("rpmdrake")." 9.1"); $::noBorder = 0; my $formatlistpkg = sub { myformatList(sort { uc($a) cmp uc($b) } @_) }; @@ -946,10 +946,11 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( unlink $_; } - my %sources = $urpm->download_source_packages($local_sources, $list, '', - sub { interactive_msg_(N("Change medium"), - N("Please insert the medium named \"%s\" on device [%s]", @_), - yesno => 1, text => { yes => N("Ok"), no => N("Cancel") }) }); + my %sources = $urpm->download_source_packages($local_sources, $list, + ask_for_medium => sub { + interactive_msg_(N("Change medium"), + N("Please insert the medium named \"%s\" on device [%s]", @_), + yesno => 1, text => { yes => N("Ok"), no => N("Cancel") }) }); my @rpms_install = grep { !/\.src\.rpm$/ } values %{$urpm->extract_packages_to_install(\%sources) || {}}; my @rpms_upgrade = grep { !/\.src\.rpm$/ } values %sources; diff --git a/rpmdrake.spec b/rpmdrake.spec index d7d6f19d..6b67d3cd 100644 --- a/rpmdrake.spec +++ b/rpmdrake.spec @@ -8,7 +8,7 @@ %define name rpmdrake %define version 2.1 -%define release 4mdk +%define release 5mdk Name: %{name} Version: %{version} @@ -16,7 +16,7 @@ Release: %{release} License: GPL Source0: rpmdrake.tar.bz2 Summary: Mandrake Linux graphical front end for choosing packages for installion/removal -Requires: perl-MDK-Common >= 1.0.4-13mdk urpmi >= 4.0 perl-URPM >= 0.60 drakxtools >= 9.1-0.12mdk grpmi >= 9.0 rpmtools >= 4.5 +Requires: perl-MDK-Common >= 1.0.4-13mdk urpmi >= 4.2-8mdk perl-URPM >= 0.60 drakxtools >= 9.1-0.12mdk grpmi >= 9.0 rpmtools >= 4.5 Requires: perl-GTK2 > 0.0.cvs.2003.01.08.1 BuildRequires: curl-devel rpm-devel gettext openssl-devel perl-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot @@ -116,6 +116,11 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/*.pm %changelog +* Tue Feb 11 2003 Guillaume Cottenceau 2.1-5mdk +- rpmdrake: + - mark version as 9.1 + - fixes error "source not selected" (#966 and its army of duplicates) + * Thu Jan 23 2003 Guillaume Cottenceau 2.1-4mdk - edit-urpm-sources: - fix wrong display of medium as "enabled", after adding a medium -- cgit v1.2.1