From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 13 Oct 2010 23:22:42 +0000 (+0200)
Subject: Bug 593887: Perl 5.14 requires HTML::Parser 3.67 and DBI 1.614
X-Git-Tag: bugzilla-4.0rc1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d89dfa27c51f2aef66b8b017e044bf968f21732;p=thirdparty%2Fbugzilla.git

Bug 593887: Perl 5.14 requires HTML::Parser 3.67 and DBI 1.614
r/a=mkanat
---

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 1e1272321e..959545ce1c 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -126,7 +126,7 @@ sub REQUIRED_MODULES {
     {
         package => 'DBI',
         module  => 'DBI',
-        version => '1.41'
+        version => (vers_cmp($perl_ver, '5.13.3') > -1) ? '1.614' : '1.41'
     },
     # 2.22 fixes various problems related to UTF8 strings in hash keys,
     # as well as line endings on Windows.
@@ -165,6 +165,7 @@ sub REQUIRED_MODULES {
 };
 
 sub OPTIONAL_MODULES {
+    my $perl_ver = sprintf('%vd', $^V);
     my @modules = (
     {
         package => 'GD',
@@ -273,7 +274,7 @@ sub OPTIONAL_MODULES {
         # We need the 'utf8_mode' method of HTML::Parser, for HTML::Scrubber.
         package => 'HTML-Parser',
         module  => 'HTML::Parser',
-        version => '3.40',
+        version => (vers_cmp($perl_ver, '5.13.3') > -1) ? '3.67' : '3.40',
         feature => ['html_desc'],
     },
     {