From 29c4e92533a11e68c56576f2a0e7b2b3bb80c5f4 Mon Sep 17 00:00:00 2001
From: Michael van Elst <mlestv@openpkg.org>
Date: Mon, 3 Mar 2003 15:00:06 +0000
Subject: [PATCH] fix path computation for relative urls

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

diff --git a/openpkg-tool/openpkg-build.pl b/openpkg-tool/openpkg-build.pl
index 2f87d28f74..b00b8b9def 100644
--- a/openpkg-tool/openpkg-build.pl
+++ b/openpkg-tool/openpkg-build.pl
@@ -618,15 +618,12 @@ sub relurl ($$$) {
     } else {
         if (defined $fn) {
             $subfn = $fn;
-            $subfn =~ s/\/[^\/]*$//;
-            $subfn .= '/' unless $subfn =~ /\/$/;
-            $subfn .= $suburl;
+            $subfn =~ s/(\/)?\/*[^\/]*$/$1$suburl/;
             $suburl = $subfn;
         } else {
             $subfn = $url;
-            $subfn =~ s/\/[^\/]*$//;
-            $subfn .= '/' unless $subfn =~ /\/$/;
-            $suburl = "$subfn$suburl";
+            $subfn =~ s/(\/)?\/*[^\/]*$/$1$suburl/;
+            $suburl = $subfn;
             $subfn  = undef;
         }
     }
diff --git a/openpkg-tool/openpkg-tool.spec b/openpkg-tool/openpkg-tool.spec
index 64bbf39211..ab53b494bf 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:      20030228
-Release:      20030228
+Version:      20030303
+Release:      20030303
 
 #   list of sources
 Source0:      openpkg.sh