Bug 366408: MIME:: modules should now be optional, not required (because we've moved to using mostly the Email:: modules instead)

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit

3 files changed, 15 insertions, 34 deletions

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index a80ee9a14..43cdaf7ec 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -83,17 +83,6 @@ sub REQUIRED_MODULES {
         version => '2.12'
     },
     {
-        package => 'MIME-Base64',
-        module  => 'MIME::Base64',
-        version => '3.01'
-    },
-    {
-        package => 'MIME-tools',
-        # MIME::Parser is packaged as MIME::Tools on ActiveState Perl
-        module  => ON_WINDOWS ? 'MIME::Tools' : 'MIME::Parser',
-        version => '5.406'
-    },
-    {
         package => 'Email-Send',
         module  => 'Email::Send',
         version => ON_WINDOWS ? '2.16' : '2.00'
@@ -152,6 +141,13 @@ sub OPTIONAL_MODULES {
         feature => 'Move Bugs Between Installations'
     },
     {
+        package => 'MIME-tools',
+        # MIME::Parser is packaged as MIME::Tools on ActiveState Perl
+        module  => ON_WINDOWS ? 'MIME::Tools' : 'MIME::Parser',
+        version => '5.406',
+        feature => 'Move Bugs Between Installations'
+    },
+    {
         package => 'libwww-perl',
         module  => 'LWP::UserAgent',
         version => 0,
diff --git a/docs/xml/installation.xml b/docs/xml/installation.xml
index ad9bfffea..a18f6f98c 100644
--- a/docs/xml/installation.xml
+++ b/docs/xml/installation.xml
@@ -1,5 +1,5 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
-<!-- $Id: installation.xml,v 1.135 2006/11/29 18:00:53 lpsolit%gmail.com Exp $ -->
+<!-- $Id: installation.xml,v 1.136 2007/02/13 00:19:00 mkanat%bugzilla.org Exp $ -->
 <chapter id="installing-bugzilla">
   <title>Installing Bugzilla</title>
 
@@ -331,18 +331,6 @@
 
         <listitem>
           <para>
-            MIME::Base64 (&min-mime-base64-ver;)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            MIME::Parser (&min-mime-parser-ver;)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
             Email::Send (&min-email-send-ver;)
           </para>
         </listitem>
@@ -394,7 +382,13 @@
         <listitem>
           <para>
             <link linkend="install-modules-xml-twig">XML::Twig</link>
-            (&min-xml-twig-ver;) for the XML interface
+            (&min-xml-twig-ver;) for bug import/export
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            MIME::Parser (&min-mime-parser-ver;) for bug import/export
           </para>
         </listitem>
 
diff --git a/docs/xml/modules.xml b/docs/xml/modules.xml
index a73469ac2..6e325c5a7 100644
--- a/docs/xml/modules.xml
+++ b/docs/xml/modules.xml
@@ -140,15 +140,6 @@
     </para>
 
     <para>
-      MIME::Base64:
-      <literallayout>
-        CPAN Download Page: <ulink url="http://search.cpan.org/dist/MIME-Base64/"/>
-        PPM Download Link: <ulink url="http://ppm.activestate.com/PPMPackages/zips/8xx-builds-only/Windows/MIME-Base64-2.20.zip"/>
-        Documentation: <ulink url="http://search.cpan.org/dist/MIME-Base64/Base64.pm"/>
-      </literallayout>
-    </para>
-
-    <para>
       MIME::Parser (part of MIME-tools):
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/MIME-tools/"/>