OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 02-Jul-2003 14:23:51
Branch: HEAD Handle: 2003070213234901
Modified files:
openpkg-src/openpkg-tool
openpkg-build.pl openpkg-tool.spec
openpkg-web news.txt
Log:
correct handling of conditional provides
Summary:
Revision Changes Path
1.90 +13 -8 openpkg-src/openpkg-tool/openpkg-build.pl
1.63 +2 -2 openpkg-src/openpkg-tool/openpkg-tool.spec
1.5151 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================================
$ cvs diff -u -r1.89 -r1.90 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 30 Jun 2003 19:36:07 -0000 1.89
+++ openpkg-src/openpkg-tool/openpkg-build.pl 2 Jul 2003 12:23:50 -0000 1.90
@@ -883,7 +883,7 @@
};
}
if ($section eq 'provides') {
- push @provides, $body;
+ push @provides, $body if !defined $usecond;
} elsif ($section ne '') {
push @{$bags->{"$usecond"}->{$section}}, $body;
}
@@ -957,7 +957,7 @@
my(@include);
my($xml,$rep,$sub);
- my($provides,@provides,%options,$rec);
+ my(@provides,%options,$rec);
my($href,$name,$version,$release,$desc);
my($options);
@@ -979,15 +979,20 @@
defined $version &&
defined $release;
- $provides = $_->{'Provides'}->[0]->{'rdf:bag'}->[0];
- if ($provides->{'rdf:li'}) {
- $provides = $provides->{'rdf:li'};
- } else {
- $provides = $provides->{'resource'};
+ @provides = ();
+ if ($_->{'Provides'}) {
+ @provides = map {
+ $_ = $_->{'rdf:bag'}->[0];
+ $_ = $_->{'rdf:li'} ? $_->{'rdf:li'} : $_->{'resource'};
+ @$_;
+ } grep {
+ !exists $_->{'cond'}
+ } @{$_->{'Provides'}};
}
+
@provides = map {
depends2provides(parse_depends($_))
- } @$provides;
+ } @provides;
%options = map {
( $_->{with} => $_->{version} )
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-tool.spec
============================================================================
$ cvs diff -u -r1.62 -r1.63 openpkg-tool.spec
--- openpkg-src/openpkg-tool/openpkg-tool.spec 30 Jun 2003 19:36:07 -0000
1.62
+++ openpkg-src/openpkg-tool/openpkg-tool.spec 2 Jul 2003 12:23:50 -0000
1.63
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Bootstrapping
License: GPL
-Version: 20030630
-Release: 20030630
+Version: 20030702
+Release: 20030702
# list of sources
Source0: openpkg.sh
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5150 -r1.5151 news.txt
--- openpkg-web/news.txt 2 Jul 2003 10:17:06 -0000 1.5150
+++ openpkg-web/news.txt 2 Jul 2003 12:23:49 -0000 1.5151
@@ -1,3 +1,4 @@
+02-Jul-2003: Upgraded package: P<openpkg-tool-20030702-20030702>
02-Jul-2003: Upgraded package: P<mico-2.3.10-20030702>
02-Jul-2003: Upgraded package: P<libmcrypt-2.5.7-20030702>
02-Jul-2003: Upgraded package: P<cvsps-2.0rc1-20030702>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
