- fix perl module version detection for packages defined like 'package foo ver;'

[packages/rpm.git] / perl.prov

diff --git a/perl.prov b/perl.prov
index 6a66f7652b8e8a9204115a3c9edf26021e4fde29..6e98f9a4ae03d8f6d931ad221c3a90974a4cfb87 100644 (file)
--- a/perl.prov
+++ b/perl.prov
@@ -92,13 +92,14 @@ sub process_file {
 
                # search for the package name
                if (
-                       !defined $package
-                       && ( my ($pack) = m/^\s*(?:\{\s*)?package\s+([_:a-zA-Z0-9]+?):*\s*;/ )
+                       (!defined $package || !defined $version)
+                       && ( my ($pack, $ver) = m/^\s*(?:\{\s*)?package\s+([_:a-zA-Z0-9]+?)\s*(?:v?([0-9_.]+)\s*)?[;{]/)
                        && $1 ne 'main'
                        && match_the_path( $file, $1 )
                  )
                {
                        $package = $pack;
+                       $version = $ver;
                }
 
                if ( !defined $version && /([\$*])(([\w\:\']*)\bVERSION)\b.*\=/ ) {