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: 26-Aug-2003 16:41:36
Branch: HEAD Handle: 2003082615413402
Modified files:
openpkg-src/openpkg-tool
openpkg-build.pl openpkg-tool.spec
openpkg-web news.txt
Log:
handle pubkey entries in rpm output
Summary:
Revision Changes Path
1.99 +4 -2 openpkg-src/openpkg-tool/openpkg-build.pl
1.76 +2 -2 openpkg-src/openpkg-tool/openpkg-tool.spec
1.6298 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================================
$ cvs diff -u -r1.98 -r1.99 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 2 Aug 2003 22:19:52 -0000 1.98
+++ openpkg-src/openpkg-tool/openpkg-build.pl 26 Aug 2003 14:41:36 -0000 1.99
@@ -300,7 +300,7 @@
my($s) = @_;
my($nam,$val,$pre,$with,$pxy,$ver,$rel);
- ($nam,$val) = $s =~ /^(\S+)\s*(?:=\s*(\S*?))?$/;
+ ($nam,$val) = $s =~ /^([^\s\(]+(?:\([^\)]*\))?)\s*(?:=\s*(\S*?))?$/;
#
# build options are encoded as a Requirement
@@ -429,6 +429,7 @@
@list = ();
foreach (@l) {
next unless $p = parse_provides($_);
+ next if $p->{name} =~ /^gpg\(/;
# is this an option ?
if (defined $p->{with}) {
@@ -491,10 +492,11 @@
@list = ();
foreach (@l) {
($name,$version,$release,$req) = /^(\S+)\s+(\S+)\s+(\S+)\s*(.*?)\s*$/;
+ next if $name eq 'gpg-pubkey';
$release =~ s/\+PROXY$//;
while ($req =~ /\.(\S+)\s+\.(\S*)\s+\.(\S*)/g) {
$p = parse_depends("$1 $2 $3");
- next if $p->{name} =~ /^rpmlib\(/;
+ next if $p->{name} =~ /^(rpmlib|gpg)\(/;
$vs = vs({ version => $version, release => $release});
$p = { cond => '', value => $p };
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-tool.spec
============================================================================
$ cvs diff -u -r1.75 -r1.76 openpkg-tool.spec
--- openpkg-src/openpkg-tool/openpkg-tool.spec 16 Aug 2003 16:30:49 -0000
1.75
+++ openpkg-src/openpkg-tool/openpkg-tool.spec 26 Aug 2003 14:41:36 -0000
1.76
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Bootstrapping
License: GPL
-Version: 20030816
-Release: 20030816
+Version: 20030826
+Release: 20030826
# list of sources
Source0: openpkg.sh
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6297 -r1.6298 news.txt
--- openpkg-web/news.txt 26 Aug 2003 13:55:15 -0000 1.6297
+++ openpkg-web/news.txt 26 Aug 2003 14:41:34 -0000 1.6298
@@ -1,3 +1,4 @@
+26-Aug-2003: Upgraded package: P<openpkg-tool-20030826-20030826>
26-Aug-2003: Upgraded package: P<openpkg-20030826-20030826>
26-Aug-2003: Upgraded package: P<cacti-0.8.2a-20030826>
26-Aug-2003: Upgraded package: P<perl-xml-20030826-20030826>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
