[freeside-commits] freeside/install/rpm rpm2Bundle, 1.1.2.1, 1.1.2.2

[Richard Siddall]

Update of /home/cvs/cvsroot/freeside/install/rpm
In directory wavetail.420.am:/tmp/cvs-serv32263/install/rpm

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	rpm2Bundle 
Log Message:
Now handles hyphenated Perl requirements as well as those in parentheses, and
handles more version relation types.


Index: rpm2Bundle
===================================================================
RCS file: /home/cvs/cvsroot/freeside/install/rpm/Attic/rpm2Bundle,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- rpm2Bundle	8 Jul 2007 21:25:56 -0000	1.1.2.1
+++ rpm2Bundle	18 Nov 2008 02:56:20 -0000	1.1.2.2
@@ -39,7 +39,8 @@
 	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 @@
 			}
 			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;
 		}
 	}