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: 10-Jan-2003 10:50:58 Branch: HEAD Handle: 2003011009505601 Modified files: openpkg-src/openpkg-tool openpkg-build.pl openpkg-tool.spec openpkg-web news.txt Log: fix option parsing Summary: Revision Changes Path 1.28 +5 -2 openpkg-src/openpkg-tool/openpkg-build.pl 1.21 +2 -2 openpkg-src/openpkg-tool/openpkg-tool.spec 1.2631 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg-tool/openpkg-build.pl ============================================================================ $ cvs diff -u -r1.27 -r1.28 openpkg-build.pl --- openpkg-src/openpkg-tool/openpkg-build.pl 9 Jan 2003 14:23:17 -0000 1.27 +++ openpkg-src/openpkg-tool/openpkg-build.pl 10 Jan 2003 09:50:57 -0000 1.28 @@ -361,15 +361,18 @@ sub depends2provides ($) { my($dep) = @_; - my($ver,$rel,$pxy); + my($ver,$rel,$pxy,$pre,$with); ($ver,$rel,$pxy) = $dep->{val} =~ /^([^\s\-]+)-([^\s\+]+)(\+PROXY)?$/; + ($pre,$with) = $dep->{name} =~ /^(\S+?)::(\S*)$/; return { name => $dep->{name}, version => (defined $ver ? $ver : $dep->{val}), release => $rel, - proxy => $pxy + proxy => $pxy, + prefix => $pre, + with => $with } } @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg-tool/openpkg-tool.spec ============================================================================ $ cvs diff -u -r1.20 -r1.21 openpkg-tool.spec --- openpkg-src/openpkg-tool/openpkg-tool.spec 9 Jan 2003 14:23:17 -0000 1.20 +++ openpkg-src/openpkg-tool/openpkg-tool.spec 10 Jan 2003 09:50:57 -0000 1.21 @@ -32,8 +32,8 @@ Distribution: OpenPKG [EVAL] Group: Bootstrapping License: GPL -Version: 20030109 -Release: 20030109 +Version: 20030110 +Release: 20030110 # list of sources Source0: openpkg.sh @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.2630 -r1.2631 news.txt --- openpkg-web/news.txt 10 Jan 2003 09:45:30 -0000 1.2630 +++ openpkg-web/news.txt 10 Jan 2003 09:50:56 -0000 1.2631 @@ -1,3 +1,4 @@ +10-Jan-2003: Upgraded package: P<openpkg-tool-20030110-20030110> 10-Jan-2003: Upgraded package: P<tidy-20030108-20030110> 10-Jan-2003: Upgraded package: P<imap-2002b-20030110> 10-Jan-2003: Upgraded package: P<ccache-2.1.1-20030110> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]