X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rpm%2Frpm2Bundle;h=469c27b0fbb4f405ac0066b430c9bab6e1736809;hp=38a7ac207ab89735f304bcc138c68501a19bb8dd;hb=7bbecbdec002454c66afbc56003c0456c33f81be;hpb=5e05724a635a22776f1b973f5d7e77989da4e048 diff --git a/rpm/rpm2Bundle b/rpm/rpm2Bundle index 38a7ac207..469c27b0f 100755 --- a/rpm/rpm2Bundle +++ b/rpm/rpm2Bundle @@ -39,7 +39,8 @@ foreach my $rawrpm (@ARGV) { my %mods; foreach (@deps) { - if (/^perl\((.*)\)\s*(>=\s+([\d\.]+))?$/) { + if (/^perl\((.*)\)\s*((>=|=|<=)\s+([\d\.]+))?$/ + || /^perl-(.*)\s*((>=|=|<=)\s+([\d\.]+))?$/) { next if exists($suppress{$1}); my @parts = split /::/, $1; if (scalar @parts > 1) { @@ -47,10 +48,10 @@ foreach my $rawrpm (@ARGV) { } if ($verbose) { print STDERR "$1"; - print STDERR " >= $3" if $3; + print STDERR " $3 $4" if $4; print STDERR "\n"; } - $mods{$1} = $3 ? $3 : undef; + $mods{$1} = $4 ? $4 : undef; } }