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:   03-Feb-2003 13:58:56
  Branch: HEAD                             Handle: 2003020312585401

  Modified files:
    openpkg-src/openpkg-tool
                            openpkg-build.pl openpkg-tool.spec
    openpkg-web             news.txt

  Log:
    prefer packages matching target name over packages providing target
    name to resolve ambiguities

  Summary:
    Revision    Changes     Path
    1.47        +7  -0      openpkg-src/openpkg-tool/openpkg-build.pl
    1.32        +2  -2      openpkg-src/openpkg-tool/openpkg-tool.spec
    1.3171      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg-tool/openpkg-build.pl
  ============================================================================
  $ cvs diff -u -r1.46 -r1.47 openpkg-build.pl
  --- openpkg-src/openpkg-tool/openpkg-build.pl 24 Jan 2003 14:48:47 -0000      1.46
  +++ openpkg-src/openpkg-tool/openpkg-build.pl 3 Feb 2003 12:58:55 -0000       1.47
  @@ -1081,6 +1081,13 @@
           @recs = @nrecs if @nrecs;
       }
   
  +    if (scalar(@recs) > 1) {
  +        @nrecs = grep {
  +            $name eq $_->{name}
  +        } @recs;
  +        @recs = @nrecs if @nrecs;
  +    }
  +
       if (scalar(@recs) > 1 && !$env->{sourceonly}) {
           @nrecs = grep {
               defined $_->{'platform'}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg-tool/openpkg-tool.spec
  ============================================================================
  $ cvs diff -u -r1.31 -r1.32 openpkg-tool.spec
  --- openpkg-src/openpkg-tool/openpkg-tool.spec        31 Jan 2003 12:26:10 -0000     
 1.31
  +++ openpkg-src/openpkg-tool/openpkg-tool.spec        3 Feb 2003 12:58:55 -0000      
 1.32
  @@ -32,8 +32,8 @@
   Distribution: OpenPKG [PLUS]
   Group:        Bootstrapping
   License:      GPL
  -Version:      20030124
  -Release:      20030124
  +Version:      20030203
  +Release:      20030203
   
   #   list of sources
   Source0:      openpkg.sh
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.3170 -r1.3171 news.txt
  --- openpkg-web/news.txt      3 Feb 2003 12:39:06 -0000       1.3170
  +++ openpkg-web/news.txt      3 Feb 2003 12:58:54 -0000       1.3171
  @@ -1,3 +1,4 @@
  +03-Feb-2003: Upgraded package: P<openpkg-tool-20030203-20030203>
   03-Feb-2003: Upgraded package: P<rt-2.0.15-20030203>
   03-Feb-2003: Upgraded package: P<vim-6.1.317-20030203>
   03-Feb-2003: Upgraded package: P<pango-1.2.1-20030203>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to