Changeset 64 for trunk


Ignore:
Timestamp:
06/06/06 14:46:53 (18 years ago)
Author:
kdeugau
Message:

/trunk

"Correct" (hah!) format for versioned Requires

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/debbuild

    r63 r64  
    745745    # comma and space here (if needed) in case there were "Requires" specified
    746746    # in the spec file - those would precede these.
    747     ($pkgdata{$pkg}{requires} .= getreqs("$buildroot/$pkg")) =~ s/^, //;
     747    $pkgdata{$pkg}{requires} .= getreqs("$buildroot/$pkg");
     748
     749    # magic needed to properly version dependencies...
     750    # only provided deps will really be included
     751    $pkgdata{$pkg}{requires} =~ s/\s+//g;
     752    my @deps = split /,/, $pkgdata{$pkg}{requires};
     753    my $tmp = '';
     754    foreach my $dep (@deps) {
     755      if (my ($name,$rel,$value) = ($dep =~ /^([a-zA-Z0-9._-]+)([><=]+)([a-zA-Z0-9._-]+)$/)) {
     756        $tmp .= ", $name ($rel $value)";
     757      } else {
     758        $tmp .= ", $dep";
     759      }
     760    }
     761    ($pkgdata{$pkg}{requires} = $tmp) =~ s/^, //;
    748762
    749763    # Do this here since we're doing {depends}...
Note: See TracChangeset for help on using the changeset viewer.