OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 23-Jun-2007 21:49:11
Branch: HEAD Handle: 2007062320491100
Modified files:
openpkg-tools/cmd makeproxy.pl
Log:
options eventually become provides, so let "openpkg makeproxy" fake
provides, too
Summary:
Revision Changes Path
1.8 +7 -1 openpkg-tools/cmd/makeproxy.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/makeproxy.pl
============================================================================
$ cvs diff -u -r1.7 -r1.8 makeproxy.pl
--- openpkg-tools/cmd/makeproxy.pl 1 Jan 2007 17:45:11 -0000 1.7
+++ openpkg-tools/cmd/makeproxy.pl 23 Jun 2007 19:49:11 -0000 1.8
@@ -240,6 +240,7 @@
$q .= "S-$t:<%{$t}>\\n";
}
$q .= '[M-PREREQ:<%{REQUIRENAME} %|REQUIREFLAGS?{%{REQUIREFLAGS:depflags}
%{REQUIREVERSION}}:{}|>\n]';
+$q .= '[M-PROVIDES:<%{PROVIDENAME} %|PROVIDEFLAGS?{%{PROVIDEFLAGS:depflags}
%{PROVIDEVERSION}}:{}|>\n]';
$q .= '[M-PREFIXES:<%{PREFIXES}>\n]';
my $cmd = sprintf("%s -q %s --qf '$q' %s", $master_rpm, (-f $input ? "-p" :
""), $input);
my $o = runcmd("$cmd|");
@@ -251,6 +252,7 @@
$r = parseresponse($r, $o);
my $BD = '';
my $ID = '';
+my $PR = '';
foreach my $d (@{$r->{PREREQ}}) {
if ($d =~ m|^OpenPKG|i) {
$BD .= ", " if ($BD ne '');
@@ -259,6 +261,10 @@
$ID .= ", " if ($ID ne '');
$ID .= $d;
}
+foreach my $d (@{$r->{PROVIDES}}) {
+ $PR .= ", " if ($PR ne '');
+ $PR .= $d;
+}
# prepare build environment
verbose("++ establishing temporary OpenPKG RPM environment");
@@ -304,9 +310,9 @@
$S .= "BuildRoot: $tmpdir/bld\n";
$S .= "BuildPreReq: $BD\n" if ($BD ne '');
$S .= "PreReq: $ID\n" if ($ID ne '');
+$S .= "Provides: $PR\n" if ($PR ne '');
$S .= "AutoReq: no\n";
$S .= "AutoReqProv: no\n";
-$S .= "Provides: ".$r->{NAME}." = ".$r->{VERSION}."-".$r->{RELEASE}."\n";
$S .= "\n";
$S .= "\%description\n";
$S .= " ".$r->{DESCRIPTION}."\n";
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
