aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-09-04 16:41:04 +0000
committerFrancois Pons <fpons@mandriva.com>2000-09-04 16:41:04 +0000
commitcae24bfca78cf360a9a85f0aa97436ce810d4da0 (patch)
tree59064f75e2fe6a9485838c8e8b85414cdd9581c3
parent2e039c2cf245e35fc2168c6c535e775995cc3461 (diff)
downloadrpmtools-cae24bfca78cf360a9a85f0aa97436ce810d4da0.tar
rpmtools-cae24bfca78cf360a9a85f0aa97436ce810d4da0.tar.gz
rpmtools-cae24bfca78cf360a9a85f0aa97436ce810d4da0.tar.bz2
rpmtools-cae24bfca78cf360a9a85f0aa97436ce810d4da0.tar.xz
rpmtools-cae24bfca78cf360a9a85f0aa97436ce810d4da0.zip
*** empty log message ***
-rw-r--r--rpmtools.pm4
-rw-r--r--rpmtools.spec13
2 files changed, 13 insertions, 4 deletions
diff --git a/rpmtools.pm b/rpmtools.pm
index 280e899..8b194d3 100644
--- a/rpmtools.pm
+++ b/rpmtools.pm
@@ -183,7 +183,7 @@ sub compute_depslist {
foreach (@$_) {
my ($id, $base) = $params->{info}{$_} ? ($params->{info}{$_}{id},
$params->{use_base_flag} && exists $params->{info}{$_}{base}) : ($_, 0);
- $to_drop ||= $id == $pkg->{id} || $requires_id{$id} || $base;
+ $to_drop ||= $id == $pkg->{id} || $requires_id{$id} || $pkg->{name} ne 'basesystem' && $base;
push @choices_id, $id;
}
$to_drop or push @requires_id, \@choices_id;
@@ -191,7 +191,7 @@ sub compute_depslist {
my ($id, $base) = $params->{info}{$_} ? ($params->{info}{$_}{id},
$params->{use_base_flag} && exists $params->{info}{$_}{base}) : ($_, 0);
$requires_id{$id} = $_;
- $id == $pkg->{id} or $base or push @requires_id, $id;
+ $id == $pkg->{id} || $pkg->{name} ne 'basesystem' && $base or push @requires_id, $id;
}
}
#- cannot remove requires values as they are necessary for closure on incremental job.
diff --git a/rpmtools.spec b/rpmtools.spec
index f9a99c1..4ce3cc6 100644
--- a/rpmtools.spec
+++ b/rpmtools.spec
@@ -1,5 +1,5 @@
%define name rpmtools
-%define release 9mdk
+%define release 10mdk
# do not modify here, see Makefile in the CVS
%define version 1.2
@@ -50,7 +50,11 @@ rm -rf $RPM_BUILD_ROOT
%{make} -f Makefile_core install PREFIX=$RPM_BUILD_ROOT%{_prefix}
# compability tools, based upon parsehdlist ones.
-ln -s parsehdlist $RPM_BUILD_ROOT%{_bindir}/hdlist2names
+cat <<EOF >$RPM_BUILD_ROOT%{_bindir}/hdlist2names
+#!/bin/sh
+%{_bindir}/parsehdlist $*
+EOF
+chmod a+x $RPM_BUILD_ROOT%{_bindir}/hdlist2names
cat <<EOF >$RPM_BUILD_ROOT%{_bindir}/hdlist2prereq
#!/bin/sh
@@ -99,6 +103,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Sep 04 2000 François Pons <fpons@mandrakesoft.com> 1.2-10mdk
+- fixed management of basesystem, so that it always keeps all
+ its dependancies in order to keep ability to update base packages
+ when dobles on basesystem exists.
+
* Sun Sep 03 2000 François Pons <fpons@mandrakesoft.com> 1.2-9mdk
- fixed write_depslist to avoid resorting, fixes dobles.
- fixed compute_depslist to use only remove dobles in provides.