aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rpmtools.pm9
-rw-r--r--rpmtools.spec8
2 files changed, 15 insertions, 2 deletions
diff --git a/rpmtools.pm b/rpmtools.pm
index 90727eb..adcdcc2 100644
--- a/rpmtools.pm
+++ b/rpmtools.pm
@@ -337,6 +337,10 @@ sub compute_depslist {
foreach (keys %requires) {
$ordered{$_} += 10001;
}
+ } elsif ($_->{name} eq 'msec') {
+ foreach (keys %requires) {
+ $ordered{$_} += 20001;
+ }
} else {
foreach (keys %requires) {
++$ordered{$_};
@@ -346,12 +350,15 @@ sub compute_depslist {
#- some package should be sorted at the beginning.
my $fixed_weight = 10000;
- foreach (qw(basesystem filesystem setup glibc sash bash libtermcap2 termcap readline ldconfig)) {
+ foreach (qw(basesystem msec * locales filesystem setup glibc sash bash libtermcap2 termcap readline ldconfig)) {
foreach (keys %{$params->{provides}{$_} || {}}) {
$ordered{$_} = $fixed_weight;
}
$fixed_weight += 10000;
}
+ foreach (grep { /locales-[a-zA-Z]/ } keys %ordered) {
+ $ordered{$_} = 35000;
+ }
#- compute base flag, consists of packages which are required without
#- choices of basesystem and are ALWAYS installed. these packages can
diff --git a/rpmtools.spec b/rpmtools.spec
index 683cae9..3e85092 100644
--- a/rpmtools.spec
+++ b/rpmtools.spec
@@ -1,5 +1,5 @@
%define name rpmtools
-%define release 2mdk
+%define release 3mdk
# do not modify here, see Makefile in the CVS
%define version 4.1
@@ -54,6 +54,12 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/perl5/man/*/*
%changelog
+* Wed Jan 30 2002 François Pons <fpons@mandrakesoft.com> 4.1-3mdk
+- make sure msec is installed before chkconfig for most
+ packages except modutils and initscripts (in order to be
+ dependancy safe).
+- make sure locales-* are installed very early to avoid warnings.
+
* Thu Jan 24 2002 François Pons <fpons@mandrakesoft.com> 4.1-2mdk
- fixed wrong _parse_ or rpm file.