diff options
| -rw-r--r-- | rpmtools.pm | 16 | ||||
| -rw-r--r-- | rpmtools.spec | 8 |
2 files changed, 17 insertions, 7 deletions
diff --git a/rpmtools.pm b/rpmtools.pm index b3bc6d9..6805fd0 100644 --- a/rpmtools.pm +++ b/rpmtools.pm @@ -154,7 +154,9 @@ sub compute_depslist { } } #- setup, filesystem and basesystem should be at the beginning. - @ordered{qw(setup filesystem basesystem)} = (30000, 20000, 10000); + @ordered{qw(ld.so readline termcap libtermcap bash sash glibc + setup filesystem basesystem)} = + (100000, 90000, 80000, 70000, 60000, 50000, 40000, 30000, 20000, 10000); #- compute base flag, consists of packages which are required without #- choices of basesystem and are ALWAYS installed. these packages can @@ -208,7 +210,8 @@ sub read_depslist { my ($params, $FILE) = @_; my $global_id = scalar @{$params->{depslist}}; - foreach (<$FILE>) { + local $_; + while (<$FILE>) { chomp; /^\s*#/ and next; my ($name, $version, $release, $size, $deps) = /^(\S*)-([^-\s]+)-([^-\s]+)\s+(\d+)\s*(.*)/; @@ -290,7 +293,8 @@ sub write_depslist { sub read_provides_files { my ($params, $FILE) = @_; - foreach (<$FILE>) { + local $_; + while (<$FILE>) { chomp; my ($k, @v) = split ':'; $k =~ /^\// and $params->{provides}{$k} ||= undef; @@ -332,7 +336,8 @@ sub keep_only_cleaned_provides_files { sub read_provides { my ($params, $FILE) = @_; - foreach (<$FILE>) { + local $_; + while (<$FILE>) { chomp; my ($k, @v) = split ':'; $params->{provides}{$k} = @v > 0 ? \@v : undef; @@ -354,7 +359,8 @@ sub read_compss { my ($params, $FILE) = @_; my $p; - foreach (<$FILE>) { + local $_; + while (<$FILE>) { /^\s*$/ || /^#/ and next; s/#.*//; diff --git a/rpmtools.spec b/rpmtools.spec index d54348a..5b02ddd 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -1,5 +1,5 @@ %define name rpmtools -%define release 5mdk +%define release 6mdk # do not modify here, see Makefile in the CVS %define version 2.0 @@ -11,7 +11,7 @@ Release: %{release} # get the source from our cvs repository (see # http://www.linuxmandrake.com/en/cvs.php3) Source0: %{name}-%{version}.tar.bz2 -Copyright: GPL +License: GPL Group: System/Configuration/Packaging BuildRoot: %{_tmppath}/%{name}-buildroot Prefix: %{_prefix} @@ -104,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 16 2000 François Pons <fpons@mandrakesoft.com> 2.0-6mdk +- updated order of 9 first package to be installed. +- removed memory consuming code in perl. + * Tue Nov 7 2000 Pixel <pixel@mandrakesoft.com> 2.0-5mdk - add requires for -devel |