- err, with expression

[packages/rpm.git] / rpm-perl_req-use_base.patch

diff --git a/rpm-perl_req-use_base.patch b/rpm-perl_req-use_base.patch
index 18716dfdd2e8cddeef93e1e78d18c9c3523c36dc..d4376604312f00d15f1da6d014469c740105489c 100644 (file)
--- a/rpm-perl_req-use_base.patch
+++ b/rpm-perl_req-use_base.patch
@@ -9,18 +9,18 @@
 +    if (
 +        m/^ \s*
 +           use \s+ base
-+           (?:  \s+ q[wq]? \s* ( [!@#\$%^&*'"\/+=`~,.?-] ) \s* ( \S+? (?: \s+\S+? )*? ) \s* \1
++           (?:  \s+ q[wq]? \s* ( [!@#\$%^&*'"\/+=`~,.?-] ) \s* ( [\w:]+? (?: \s+[\w:]+? )*? ) \s* \1
 +               |
-+                \s* ( ["'] ) ( \S+? ) \3
++                \s* ( ["'] ) ( [\w:]+? ) \3
 +               |
 +                # qw[], qw(), qw<>, qw{} are handled here; lax, but who gives
-+                \s+ q[wq]? \s* [\[({<] \s* ( \S+? (?: \s+\S+? )*? ) \s* [\])}>]
++                \s+ q[wq]? \s* [\[({<] \s* ( [\w:]+? (?: \s+[\w:]+? )*? ) \s* [\])}>]
 +           )
 +           \s* ;
 +       /x
 +      )
 +    {
-+        my @deps = ( $1 ? split /\s+/, $2 : $3 ? split /\s+/, $4 : $5 );
++        my @deps = ( $1 ? split /\s+/, $2 : $3 ? $4 : split /\s+/, $5 );
 +        for my $mod ( grep !exists $require{$_}, @deps ) {
 +            $require{$mod} = '';
 +            $line{$mod}    = $_;