Update to Win32-0.42 from CPAN

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 55e3af5..7e58390 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1633,7 +1633,7 @@ use File::Glob qw(:case);
     'Win32' =>
        {
        'MAINTAINER'    => 'jand',
-       'DISTRIBUTION'  => "JDB/Win32-0.41.tar.gz",
+       'DISTRIBUTION'  => "JDB/Win32-0.42.tar.gz",
        'FILES'         => q[cpan/Win32],
        'UPSTREAM'      => 'cpan',
        },

diff --git a/cpan/Win32/Changes b/cpan/Win32/Changes
index 24235aa..00c7407 100644 (file)
--- a/cpan/Win32/Changes
+++ b/cpan/Win32/Changes
@@ -1,5 +1,10 @@
 Revision history for the Perl extension Win32.\r
 \r
+0.42   [2011-01-06]\r
+       - remove brittle test for Win32::GetLongPathName($ENV{SYSTEMROOT})\r
+         which will fail if the case of the environment value doesn't\r
+         exactly match the case of the directory name on the filesystem.\r
+\r
 0.41   [2010-12-10]\r
        - Fix Win32::GetChipName() to return the native processor type when\r
          running 32-bit Perl on 64-bit Windows (WOW64).  This will also\r

diff --git a/cpan/Win32/Makefile.PL b/cpan/Win32/Makefile.PL
index 913641e..89a568a 100644 (file)
--- a/cpan/Win32/Makefile.PL
+++ b/cpan/Win32/Makefile.PL
@@ -10,7 +10,7 @@ unless ($^O eq "MSWin32" || $^O eq "cygwin") {
 my %param = (\r
     NAME          => 'Win32',\r
     VERSION_FROM  => 'Win32.pm',\r
-    INSTALLDIRS   => ($] >= 5.008004 ? 'perl' : 'site'),\r
+    INSTALLDIRS   => ($] >= 5.008004 && $] < 5.012 ? 'perl' : 'site'),\r
 );\r
 $param{NO_META} = 1 if eval "$ExtUtils::MakeMaker::VERSION" >= 6.10_03;\r
 $param{LIBS} = ['-L/lib/w32api -lole32 -lversion'] if $^O eq "cygwin";\r

diff --git a/cpan/Win32/Win32.pm b/cpan/Win32/Win32.pm
index d2eb1ad..792ed7f 100644 (file)
--- a/cpan/Win32/Win32.pm
+++ b/cpan/Win32/Win32.pm
@@ -8,7 +8,7 @@ package Win32;
     require DynaLoader;\r
 \r
     @ISA = qw|Exporter DynaLoader|;\r
-    $VERSION = '0.41';\r
+    $VERSION = '0.42';\r
     $XS_VERSION = $VERSION;\r
     $VERSION = eval $VERSION;\r
 \r
@@ -475,7 +475,7 @@ sub _GetOSName {
             }\r
             elsif ($productinfo == PRODUCT_BUSINESS) {\r
               # "Windows 7 Business" had a name change to "Windows 7 Professional"\r
-               $desc .= $minor == 0 ? " Business" : "Professional";\r
+               $desc .= $minor == 0 ? " Business" : " Professional";\r
             }\r
             elsif ($productinfo == PRODUCT_STARTER) {\r
                $desc .= " Starter";\r

diff --git a/cpan/Win32/t/GetLongPathName.t b/cpan/Win32/t/GetLongPathName.t
index 8ad51db..b7da719 100644 (file)
--- a/cpan/Win32/t/GetLongPathName.t
+++ b/cpan/Win32/t/GetLongPathName.t
@@ -34,7 +34,6 @@ if ($drive) {
     for (@paths) {\r
        s/^c:/$drive/;\r
     }\r
-    push @paths, $ENV{SYSTEMROOT} if $ENV{SYSTEMROOT};\r
 }\r
 my %expect;\r
 @expect{@paths} = map { my $x = $_;\r