From 07d315e987873154ddd0a16fd70dccad7b157034 Mon Sep 17 00:00:00 2001
From: Michael van Elst <mlestv@openpkg.org>
Date: Tue, 26 Aug 2003 14:41:36 +0000
Subject: [PATCH] handle pubkey entries in rpm output

---
 openpkg-tool/openpkg-build.pl  | 6 ++++--
 openpkg-tool/openpkg-tool.spec | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/openpkg-tool/openpkg-build.pl b/openpkg-tool/openpkg-build.pl
index ffa28e25c7..adf9a9b9a5 100644
--- a/openpkg-tool/openpkg-build.pl
+++ b/openpkg-tool/openpkg-build.pl
@@ -300,7 +300,7 @@ sub parse_provides ($) {
     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 @@ sub get_installed () {
     @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 @@ sub get_installed () {
     @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 };
diff --git a/openpkg-tool/openpkg-tool.spec b/openpkg-tool/openpkg-tool.spec
index eec626fc23..bc34d6e9eb 100644
--- a/openpkg-tool/openpkg-tool.spec
+++ b/openpkg-tool/openpkg-tool.spec
@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [PLUS]
 Group:        Bootstrapping
 License:      GPL
-Version:      20030816
-Release:      20030816
+Version:      20030826
+Release:      20030826
 
 #   list of sources
 Source0:      openpkg.sh