diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-11-26 16:54:43 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-11-26 16:54:43 +0000 |
| commit | 76d3f1b58a4d1ffec3b57f115316d005cab105d5 (patch) | |
| tree | 970a690febe43a6bd3cb53440d5cac4028833b11 | |
| parent | 92a0f0f8ee279a28d2854b76dfd041d57902c0a5 (diff) | |
| download | rpmtools-76d3f1b58a4d1ffec3b57f115316d005cab105d5.tar rpmtools-76d3f1b58a4d1ffec3b57f115316d005cab105d5.tar.gz rpmtools-76d3f1b58a4d1ffec3b57f115316d005cab105d5.tar.bz2 rpmtools-76d3f1b58a4d1ffec3b57f115316d005cab105d5.tar.xz rpmtools-76d3f1b58a4d1ffec3b57f115316d005cab105d5.zip | |
fixed compss file reading.3.1.8
| -rw-r--r-- | rpmtools.pm | 10 | ||||
| -rw-r--r-- | rpmtools.spec | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/rpmtools.pm b/rpmtools.pm index 0cb0f8d..a3655d2 100644 --- a/rpmtools.pm +++ b/rpmtools.pm @@ -554,7 +554,7 @@ sub write_provides { #- read compss, look at DrakX for more info. sub read_compss { my ($params, $FILE) = @_; - my $p; + my ($p, %compss); local $_; while (<$FILE>) { @@ -565,9 +565,15 @@ sub read_compss { $p = $1; } else { /(\S+)/; - $params->{info}{$1} and $params->{info}{$1}{group} = $p; + $compss{$1} = $p; } } + + #- mark all packages which matching name with group. + foreach (@{$params->{depslist}}) { + $compss{$_->{name}} and $_->{group} = $compss{$_->{name}}; + } + 1; } diff --git a/rpmtools.spec b/rpmtools.spec index 80bfee9..8cd9eea 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -1,5 +1,5 @@ %define name rpmtools -%define release 7mdk +%define release 8mdk # do not modify here, see Makefile in the CVS %define version 3.1 @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/perl5/man/*/* %changelog +* Mon Nov 26 2001 François Pons <fpons@mandrakesoft.com> 3.1-8mdk +- fixed compss file reading. + * Fri Nov 16 2001 François Pons <fpons@mandrakesoft.com> 3.1-7mdk - fixed problem with depslist generation from synthesis source only. |