OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Feb-2003 10:20:18
Branch: OPENPKG_1_STABLE Handle: 2003021609201700
Modified files: (Branch: OPENPKG_1_STABLE)
openpkg-src/openpkg-tool
openpkg-build.pl openpkg-index.pl
openpkg-tool.spec
Log:
MFC: all latest fixes
Summary:
Revision Changes Path
1.39.2.3 +6 -9 openpkg-src/openpkg-tool/openpkg-build.pl
1.11.2.2 +19 -4 openpkg-src/openpkg-tool/openpkg-index.pl
1.27.2.6 +2 -2 openpkg-src/openpkg-tool/openpkg-tool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================================
$ cvs diff -u -r1.39.2.2 -r1.39.2.3 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 5 Feb 2003 16:21:29 -0000
1.39.2.2
+++ openpkg-src/openpkg-tool/openpkg-build.pl 16 Feb 2003 09:20:17 -0000
1.39.2.3
@@ -112,7 +112,7 @@
close(FH);
}
-die "openpkg:build:USAGE: $0 [-R rpm] [-r repository] [-f index.rdf] [-uUzZiqS] [-P
priv-cmd] [-N non-priv-cmd] [-p platform] [-Dwith ...] [-Ename ...] ( [-aA] |
patternlist )\n"
+die "openpkg:build:USAGE: $0 [-R rpm] [-r repository] [-f index.rdf]
[-uUzZiqsSXMLWK] [-P priv-cmd] [-N non-priv-cmd] [-p platform] [-Dwith ...] [-Ename
...] ( [-aA] | patternlist )\n"
unless $#ARGV >= 0 || ($#ARGV == -1 && ($opt_a || $opt_A));
##########################################################################
@@ -719,6 +719,7 @@
$platform = undef;
$prefix = undef;
$bags = {};
+ @provides = ();
}
if (!(defined $href) &&
@@ -1145,16 +1146,12 @@
}
}
- if (@recs) {
- if ($env->{upgrade}) {
- $rec = $recs[-1];
- } else {
- $rec = $recs[0];
- }
- } else {
+ if (scalar(@recs) == 0) {
return;
}
+ $rec = $recs[-1];
+
print "# source for $name is ".vsn($rec)."\n";
return $rec;
@@ -1523,7 +1520,7 @@
$target->{REBUILD}) {
unless ($env->{revdep}) {
- $env->{revdep} = get_revdep($env, $env->{intalled});
+ $env->{revdep} = get_revdep($env, $env->{installed});
}
foreach $t (@{$env->{revdep}->{$target->{name}}}) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-index.pl
============================================================================
$ cvs diff -u -r1.11.2.1 -r1.11.2.2 openpkg-index.pl
--- openpkg-src/openpkg-tool/openpkg-index.pl 21 Jan 2003 14:00:27 -0000
1.11.2.1
+++ openpkg-src/openpkg-tool/openpkg-index.pl 16 Feb 2003 09:20:17 -0000
1.11.2.2
@@ -271,7 +271,7 @@
} elsif (exists $evar{$3}) {
$term .= ($4 eq 'no' ? '! ' : '').vsub(\%evar,'%{'.$3.'}');
} else {
- warn "WARNING: unknown conditional '$2':\n< $l\n> $v\n";
+ warn "WARNING: unknown conditional '$3':\n< $l\n> $v\n";
}
}
@@ -312,9 +312,17 @@
#
if (exists $evar{$1}) {
if ($2 eq 'yes') {
- $evar{$1} = "( \%\{$1\} || ( $cond ) )";
+ if ($cond eq '') {
+ $evar{$1} = "( \%\{$1\} )";
+ } else {
+ $evar{$1} = "( \%\{$1\} || ( $cond ) )";
+ }
} elsif ($2 eq 'no') {
- $evar{$1} = "( %\{$1\} && ! ( $cond ) )";
+ if ($cond eq '') {
+ $evar{$1} = "( \%\{$1\} )";
+ } else {
+ $evar{$1} = "( %\{$1\} && ! ( $cond ) )";
+ }
} else {
warn "WARNING: logic too complex for '$1':\n< $l\n> $v\n";
}
@@ -760,8 +768,15 @@
if (defined $platform) {
$a{'Platform'} = $platform;
}
- $a{'PreReq'} =~ s/^rpmlib\(.*$//mg;
$a{'Description'} = [ $a{'Description'} ];
+
+ foreach ('Conflicts', 'PreReq', 'Provides') {
+ $a{$_} = [
+ map { make_resource($_) }
+ grep { !/^rpmlib\(/ }
+ split(/\n+/, $a{$_})
+ ];
+ }
return { map {
$_ => { '' => (ref $a{$_} ? $a{$_} : [ split(/\n+/, $a{$_}) ]) }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-tool.spec
============================================================================
$ cvs diff -u -r1.27.2.5 -r1.27.2.6 openpkg-tool.spec
--- openpkg-src/openpkg-tool/openpkg-tool.spec 5 Feb 2003 16:21:30 -0000
1.27.2.5
+++ openpkg-src/openpkg-tool/openpkg-tool.spec 16 Feb 2003 09:20:17 -0000
1.27.2.6
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Bootstrapping
License: GPL
-Version: 1.20030205
-Release: 1.20030205
+Version: 1.20030216
+Release: 1.20030216
# list of sources
Source0: openpkg.sh
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
