X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rpm%2Frpm2Bundle;h=1bc877124b228074be82ff2b63d48a037c4db497;hp=38a7ac207ab89735f304bcc138c68501a19bb8dd;hb=a36e0f8a0f69349dafaa16d1d2d57dfb6e5dbc85;hpb=5e05724a635a22776f1b973f5d7e77989da4e048

diff --git a/rpm/rpm2Bundle b/rpm/rpm2Bundle
index 38a7ac207..1bc877124 100755
--- a/rpm/rpm2Bundle
+++ b/rpm/rpm2Bundle
@@ -11,10 +11,16 @@ my $verbose = 0;
 # These are Perl dependencies that should be ignored/suppressed
 my %suppress;
 
-foreach (qw/strict subs vars FS/) {
+foreach (qw/strict subs vars base lib warnings FS/) {
 	$suppress{$_} = $_;
 }
 
+# These are Perl modules corresponding to RPM names.
+# Add entries when the mapping isn't simply "remove leading 'perl-' and replace - with ::"
+my %rpm2mod=(
+	'DBD-MySQL' => 'DBD::mysql',
+);
+
 ## These are root packages that shouldn't be cited multiple times
 ## Should figure this out with CPAN
 #my %rootpkgs;
@@ -39,18 +45,25 @@ foreach my $rawrpm (@ARGV) {
 	my %mods;
 
 	foreach (@deps) {
-		if (/^perl\((.*)\)\s*(>=\s+([\d\.]+))?$/) {
-			next if exists($suppress{$1});
-			my @parts = split /::/, $1;
+		if (/^perl\((.*?)\)\s*((>=|=|<=)\s+([\d\.]+))?$/
+		 || /^perl-(.*?)\s*((>=|=|<=)\s+([\d\.]+))?$/) {
+			my ($mod, $rel, $ver) = ($1, $3, $4);
+			if (/^perl-/) {
+				print STDERR "\"$mod\"\n" if $verbose;
+				$mod = $rpm2mod{$mod} if exists($rpm2mod{$mod});
+				$mod =~ s/-/::/g
+			}
+			next if exists($suppress{$mod});
+			my @parts = split /::/, $mod;
 			if (scalar @parts > 1) {
 				next if exists($suppress{$parts[0]});
 			}
 			if ($verbose) {
-				print STDERR "$1";
-				print STDERR " >= $3" if $3;
+				print STDERR "$mod";
+				print STDERR " $rel $ver" if $ver;
 				print STDERR "\n";
 			}
-			$mods{$1} = $3 ? $3 : undef;
+			$mods{$mod} = $ver ? $ver : undef; # Should also save $rel
 		}
 	}