diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-04-22 15:59:41 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-04-22 15:59:41 +0000 |
| commit | d471b8f9a8b205a0dba4debf35e00c71f16c3a33 (patch) | |
| tree | dd180b1708ce881c3bc6e070c8032bc044a7505f | |
| parent | c308502834119ac1acd09c37642a5291479d9684 (diff) | |
| download | rpmtools-8_2_fixed.tar rpmtools-8_2_fixed.tar.gz rpmtools-8_2_fixed.tar.bz2 rpmtools-8_2_fixed.tar.xz rpmtools-8_2_fixed.zip | |
improved generation of synthesis (smaller)v8_2_fixed4.2.12
| -rw-r--r-- | rpmtools.pm | 2 | ||||
| -rw-r--r-- | rpmtools.spec | 5 | ||||
| -rw-r--r-- | rpmtools.xs | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/rpmtools.pm b/rpmtools.pm index f320a6f..c8ee614 100644 --- a/rpmtools.pm +++ b/rpmtools.pm @@ -275,7 +275,7 @@ sub compute_depslist { $req =~ /^basesystem/ and next; #- never need to requires basesystem directly as always required! what a speed up! ref $req or $req = ($params->{info}{$req} && [ $req ] || $params->{provides}{$req} && [ keys %{$params->{provides}{$req}} ] || - ($req =~ /rpmlib\(/ ? [] : [ ($req !~ /NOTFOUND_/ && "NOTFOUND_") . $req ])); + [ ($req !~ /NOTFOUND_/ && "NOTFOUND_") . $req ]); if (@$req > 1) { #- this is a choice, no closure need to be done here. exists $requires{$req} or push @required_packages, $req; diff --git a/rpmtools.spec b/rpmtools.spec index 216f004..4063c42 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -1,5 +1,5 @@ %define name rpmtools -%define release 11mdk +%define release 12mdk # do not modify here, see Makefile in the CVS %define version 4.2 @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/perl5/man/*/* %changelog +* Mon Apr 22 2002 François Pons <fpons@mandrakesoft.com> 4.2-12mdk +- removed "rpmlib(" from synthesis file. + * Mon Apr 15 2002 François Pons <fpons@mandrakesoft.com> 4.2-11mdk - fixed lock using packdrake --extract when current working directory is on NIS and inaccessible (for root). diff --git a/rpmtools.xs b/rpmtools.xs index b8b166f..3d79013 100644 --- a/rpmtools.xs +++ b/rpmtools.xs @@ -160,7 +160,8 @@ SV *get_table_sense(Header header, int_32 tag_name, int_32 tag_flags, int_32 tag } for(i = 0; i < count; i++) { - len = strlen(list[i]); if (len >= sizeof(buff)) continue; + len = strlen(list[i]); + if (len >= sizeof(buff) || !strncmp(list[i], "rpmlib(", 7)) continue; memcpy(p = buff, list[i], len + 1); p+= len; if (flags) { |