RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   31-Aug-2007 14:56:57
  Branch: HEAD                             Handle: 2007083113565700

  Modified files:
    rpm/scripts             perl.prov

  Log:
    handle multiline split package defs better.

  Summary:
    Revision    Changes     Path
    1.12        +8  -4      rpm/scripts/perl.prov
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/scripts/perl.prov
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 perl.prov
  --- rpm/scripts/perl.prov	21 Jul 2007 12:00:35 -0000	1.11
  +++ rpm/scripts/perl.prov	31 Aug 2007 12:56:57 -0000	1.12
  @@ -130,7 +130,11 @@
         if ($package eq 'main') {
           undef $package;
         } else {
  -        $require{$package}=undef;
  +        # If $package already exists in the $require hash, it means
  +        # the package definition is broken up over multiple blocks.
  +        # In that case, don't stomp a previous $VERSION we might have
  +        # found.  (See BZ#214496.)
  +        $require{$package}=undef unless (exists $require{$package});
         }
       }
   
  @@ -140,9 +144,9 @@
   
       # here are examples of VERSION lines from the perl distribution
   
  -    #FindBin.pm:$VERSION = $VERSION = sprintf("%d.%02d", q$Revision: 1.11 $ =~ /(\d+)\.(\d+)/);
  -    #ExtUtils/Install.pm:$VERSION = substr q$Revision: 1.11 $, 10;
  -    #CGI/Apache.pm:$VERSION = (qw$Revision: 1.11 $)[1];
  +    #FindBin.pm:$VERSION = $VERSION = sprintf("%d.%02d", q$Revision: 1.12 $ =~ /(\d+)\.(\d+)/);
  +    #ExtUtils/Install.pm:$VERSION = substr q$Revision: 1.12 $, 10;
  +    #CGI/Apache.pm:$VERSION = (qw$Revision: 1.12 $)[1];
       #DynaLoader.pm:$VERSION = $VERSION = "1.03";     # avoid typo warning
       #General.pm:$Config::General::VERSION = 2.33;
       # 
  @@ .