Changeset 64

Timestamp:

06/06/06 14:46:53 (18 years ago)

Author:

kdeugau

Message:

/trunk

"Correct" (hah!) format for versioned Requires

File:

• trunk/debbuild (modified) (1 diff)

trunk/debbuild

@@ -745 +745 @@
     # comma and space here (if needed) in case there were "Requires" specified
     # in the spec file - those would precede these.
-    ($pkgdata{$pkg}{requires} .= getreqs("$buildroot/$pkg")) =~ s/^, //;
+    $pkgdata{$pkg}{requires} .= getreqs("$buildroot/$pkg");
+
+    # magic needed to properly version dependencies...
+    # only provided deps will really be included
+    $pkgdata{$pkg}{requires} =~ s/\s+//g;
+    my @deps = split /,/, $pkgdata{$pkg}{requires};
+    my $tmp = '';
+    foreach my $dep (@deps) {
+      if (my ($name,$rel,$value) = ($dep =~ /^([a-zA-Z0-9._-]+)([><=]+)([a-zA-Z0-9._-]+)$/)) {
+        $tmp .= ", $name ($rel $value)";
+      } else {
+        $tmp .= ", $dep";
+      }
+    }
+    ($pkgdata{$pkg}{requires} = $tmp) =~ s/^, //;
 
     # Do this here since we're doing {depends}...