Updated to Python-2.5.2

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7286 af4574ff-66df-0310-9fd7-8a98e5e911e0
2025-02-03 06:27:16 +08:00 · 2008-03-17 18:11:35 +00:00 · 2008-03-17 18:11:35 +00:00 · 1970f006ce
commit 1970f006ce
parent 857d5cacdb
10 changed files with 74 additions and 37 deletions
--- a/basicnet/netprogs/subversion.xml
+++ b/basicnet/netprogs/subversion.xml
@ -253,7 +253,7 @@ cp -v -R doc/* /usr/share/doc/subversion-&subversion-version;</userinput></scree

 make install-swig-py &amp;&amp;
 echo /usr/lib/svn-python \
-    &gt; /usr/lib/python&python-libdir;/site-packages/subversion.pth &amp;&amp;
+    &gt; /usr/lib/python&python-majorver;/site-packages/subversion.pth &amp;&amp;

 make install-swig-rb</userinput></screen>

--- a/general.ent
+++ b/general.ent
@ -213,8 +213,8 @@ $Date$
 <!ENTITY NASM-version                 "0.98.39">
 <!ENTITY pdl-version                  "2.4.2">
 <!ENTITY php-version                  "5.2.3">
-<!ENTITY Python-version               "2.5.1">
-<!ENTITY python-libdir                "2.5">
+<!ENTITY Python-version               "2.5.2">
+<!ENTITY python-majorver              "2.5">
 <!ENTITY ruby-version                 "1.8.6-p111">
 <!ENTITY tcl-version                  "8.4.15">
 <!ENTITY tk-version                   "8.4.15">
--- a/general/genlib/dbus-bindings.xml
+++ b/general/genlib/dbus-bindings.xml
@ -271,7 +271,7 @@ make</userinput></screen>
        <seg>None</seg>
        <seg><application>Python</application>
        <application>D-Bus</application> modules</seg>
-        <seg>/usr/lib/python&python-libdir;/site-packages/dbus and
+        <seg>/usr/lib/python&python-majorver;/site-packages/dbus and
        /usr/share/doc/dbus-python</seg>
      </seglistitem>
    </segmentedlist>
--- a/general/prog/python-modules.xml
+++ b/general/prog/python-modules.xml
@ -199,7 +199,7 @@ cd ..</userinput></screen>
      <seglistitem>
        <seg>xmlproc_parse and xmlproc_val</seg>
        <seg>PyXML Python library modules</seg>
-        <seg>/usr/lib/python&python-libdir;/site-packages/_xmlplus and
+        <seg>/usr/lib/python&python-majorver;/site-packages/_xmlplus and
        /usr/share/doc/PyXML-&pyxml-version;</seg>
      </seglistitem>
    </segmentedlist>
@ -310,7 +310,7 @@ make</userinput></screen>
        <seg>None</seg>
        <seg>Pycairo Python library module</seg>
        <seg>/usr/include/pycairo and
-        /usr/lib/python&python-libdir;/site-packages/cairo</seg>
+        /usr/lib/python&python-majorver;/site-packages/cairo</seg>
      </seglistitem>
    </segmentedlist>

@ -403,7 +403,7 @@ make</userinput></screen>
        <seg>None</seg>
        <seg>PyGObject Python library module</seg>
        <seg>/usr/include/pygtk-2.0, /usr/share/pygobject and
-        /usr/lib/python&python-libdir;/site-packages/gtk-2.0</seg>
+        /usr/lib/python&python-majorver;/site-packages/gtk-2.0</seg>
      </seglistitem>
    </segmentedlist>

@ -520,7 +520,7 @@ make</userinput></screen>
        <seg>pygtk-codegen-2.0 and pygtk-demo</seg>
        <seg>PyGTK Python library modules</seg>
        <seg>/usr/lib/pygtk, /usr/share/pygtk and
-        /usr/lib/python&python-libdir;/site-packages/gtk-2.0</seg>
+        /usr/lib/python&python-majorver;/site-packages/gtk-2.0</seg>
      </seglistitem>
    </segmentedlist>

--- a/general/prog/python.xml
+++ b/general/prog/python.xml
@ -6,10 +6,10 @@

  <!ENTITY python-download-http "http://www.python.org/ftp/python/&Python-version;/Python-&Python-version;.tar.bz2">
  <!ENTITY python-download-ftp  "&gentoo-ftp-repo;/Python-&Python-version;.tar.bz2">
-  <!ENTITY python-md5sum        "70084ffa561660f07de466c2c8c4842d">
-  <!ENTITY python-size          "9.3 MB">
-  <!ENTITY python-buildsize     "152 MB">
-  <!ENTITY python-time          "1.0 SBU (additional 2.6 SBU to run the test suite)">
+  <!ENTITY python-md5sum        "afb5451049eda91fbde10bd5a4b7fadc">
+  <!ENTITY python-size          "9.8 MB">
+  <!ENTITY python-buildsize     "180 MB">
+  <!ENTITY python-time          "1.1 SBU (additional 2.7 SBU to run the test suite)">
 ]>

 <sect1 id="python" xreflabel="Python-&Python-version;">
@ -57,19 +57,34 @@
    </itemizedlist>

    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+
+    <bridgehead renderas="sect4">Required Patch</bridgehead>
    <itemizedlist spacing='compact'>
      <listitem>
-        <para>Required patch: <ulink
+        <para><ulink
        url="&patch-root;/Python-&Python-version;-gdbm-1.patch"/></para>
      </listitem>
    </itemizedlist>

+    <bridgehead renderas="sect4">Optional HTML Documentation</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink
+        url="http://docs.python.org/ftp/python/doc/&python-majorver;/html-&python-majorver;.tar.bz2"/></para>
+      </listitem>
+    </itemizedlist>
+
    <bridgehead renderas="sect3">Python Dependencies</bridgehead>

    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="pth"/></para>
+
+    <bridgehead renderas="sect4">Optional
+    (to create package-specific support modules)</bridgehead>
    <para role="optional"><xref linkend="openssl"/>,
-    <xref linkend="tk"/>, and
-    <xref linkend="gdbm"/></para>
+    <xref linkend="tk"/>,
+    <xref linkend="gdbm"/>, and
+    <ulink url="http://sqlite.org/">SQLite 3</ulink></para>
    <!-- <xref linkend="db"/> -->

    <para condition="html" role="usernotes">User Notes:
@ -87,20 +102,38 @@
 ./configure --prefix=/usr --enable-shared &amp;&amp;
 make</userinput></screen>

-    <para>To test the results, issue: <command>make test</command>.</para>
+    <para>To test the results, issue: <command>make test</command>. Note that
+    if you have an existing <application>Python</application> installation
+    which includes the <application>PyXML</application> module, the tests could
+    produce a segmentation fault.</para>

    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>

 <screen role="root"><userinput>make install</userinput></screen>

-    <note>
-      <para>There is no documentation installed using the instructions above.
-      However, There are LaTeX sources included with the distribution. See the
-      <filename>Doc/README</filename> file in the source distribution for
-      instructions to format the LaTeX sources. Alternatively, you can download
-      preformatted documentation from
-      <ulink url="http://docs.python.org/download.html"/>.</para>
-    </note>
+    <para>There is no documentation installed using the instructions above.
+    However, There are LaTeX sources included with the distribution. See the
+    <filename>Doc/README</filename> file in the source distribution for
+    instructions to format the LaTeX sources. Alternatively, you can download
+    preformatted documentation from
+    <ulink url="http://docs.python.org/download.html"/>.</para>
+
+    <para>In order to use the <command>help ('module_name')</command> feature
+    of the <command>python</command> interpreter, you must download (or create)
+    the optional HTML documentation and install it. If you downloaded the HTML
+    docs, issue the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/Python-&Python-version;/html &amp;&amp;
+tar --strip-components=1 \
+    -C /usr/share/doc/Python-&Python-version;/html \
+    -xvf ../html-${MAJOR_VER}.tar.bz2</userinput></screen>
+
+    <para>In order for <command>python</command> to find the installed
+    documentation, you must add the following environment variable to
+    individual user's or the system's profile:</para>
+
+    <screen role="root"><userinput>export PYTHONDOCS=/usr/share/doc/Python-&Python-version;/html</userinput></screen>

  </sect2>

@ -113,12 +146,13 @@ make</userinput></screen>
      <segtitle>Installed Directories</segtitle>

      <seglistitem>
-        <seg>pydoc, python, python&python-libdir;, smtpd.py, and optionally if
+        <seg>pydoc, python, python&python-majorver;, smtpd.py, and optionally if
        <application>Tk</application> is installed, idle</seg>
-        <seg>libpython&python-libdir;.so and numerous modules installed in
-        /usr/lib/python&python-libdir;/lib-dynload</seg>
-        <seg>/usr/include/python&python-libdir;,
-         and /usr/lib/python&python-libdir;</seg>
+        <seg>libpython&python-majorver;.so and numerous modules installed in
+        /usr/lib/python&python-majorver;/lib-dynload</seg>
+        <seg>/usr/include/python&python-majorver;,
+        /usr/lib/python&python-majorver;, and
+        /usr/share/doc/python-2.5.2</seg>
      </seglistitem>
    </segmentedlist>

@ -161,12 +195,12 @@ make</userinput></screen>
      </varlistentry>

      <varlistentry id="python-ver">
-        <term><command>python&python-libdir;</command></term>
+        <term><command>python&python-majorver;</command></term>
        <listitem>
          <para>is a version-specific name for the <command>python</command>
          program.</para>
          <indexterm zone="python python-ver">
-            <primary sortas="b-python&python-libdir;">python&python-libdir;</primary>
+            <primary sortas="b-python&python-majorver;">python&python-majorver;</primary>
          </indexterm>
        </listitem>
      </varlistentry>
--- a/gnome/add/gnome-mag.xml
+++ b/gnome/add/gnome-mag.xml
@ -143,7 +143,7 @@ make</userinput></screen>
        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
        include/gnome-mag-1.0,
        lib/colorblind-applet,
-        lib/python&python-libdir;/site-packages/colorblind,
+        lib/python&python-majorver;/site-packages/colorblind,
        share/{colorblind,doc/gnome-mag-&gnome-mag-version;,gnome-mag,idl/gnome-mag-1.0}</seg>
      </seglistitem>
    </segmentedlist>
--- a/gnome/add/orca.xml
+++ b/gnome/add/orca.xml
@ -136,7 +136,7 @@ install -v -m644    docs/pydoc/*.html \
        <seg>orca</seg>
        <seg><application>Python</application> assistive technology
        (accessiblity) modules</seg>
-        <seg>/usr/lib/python&python-libdir;/site-packages/orca and
+        <seg>/usr/lib/python&python-majorver;/site-packages/orca and
        /usr/share/orca</seg>
      </seglistitem>
    </segmentedlist>
--- a/gnome/core/gnome-menus.xml
+++ b/gnome/core/gnome-menus.xml
@ -157,9 +157,9 @@ make</userinput></screen>
        profile, or in individual user's profiles as shown below:</para>

 <screen><literal>export PYTHONPATH=$PYTHONPATH:$(pkg-config --variable=prefix \
-       ORBit-2.0)/lib/python&python-libdir;/site-packages:$(pkg-config \
+       ORBit-2.0)/lib/python&python-majorver;/site-packages:$(pkg-config \
       --variable=prefix \
-       ORBit-2.0)/lib/python&python-libdir;/site-packages/GMenuSimpleEditor</literal></screen>
+       ORBit-2.0)/lib/python&python-majorver;/site-packages/GMenuSimpleEditor</literal></screen>

      </sect4>

@ -181,7 +181,7 @@ make</userinput></screen>
        <seg>&gnome-etc-dir;/xdg and the following subdirectories of
        <envar>$GNOME_PREFIX</envar>/:
        include/gnome-menus,
-        lib/python&python-libdir;/site-packages/GMenuSimpleEditor,
+        lib/python&python-majorver;/site-packages/GMenuSimpleEditor,
        share/{desktop-directories, gnome-menus}</seg>
      </seglistitem>
    </segmentedlist>
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@ -44,6 +44,9 @@
    <listitem>
      <para>March 17th, 2008</para>
      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to Python-2.5.2.</para>
+        </listitem>
        <listitem>
          <para>[alexander] - Removed xfsprogs-2.9.6, as they are incompatible
          with the LFS-6.3 kernel.</para>
--- a/server/major/samba3.xml
+++ b/server/major/samba3.xml
@ -675,7 +675,7 @@ useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \
        <seg>libnss_winbind.so, libnss_wins.so, libsmbclient.so, libmsrpc.so,
        the pam_winbind.so and pam_smbpass.so PAM libraries, and assorted
        character set, filesystem and support modules.</seg>
-        <seg>/etc/samba, /usr/lib/python&python-libdir;/site-packages/samba,
+        <seg>/etc/samba, /usr/lib/python&python-majorver;/site-packages/samba,
        /usr/lib/samba, /usr/share/doc/samba-&samba3-version;,
        /usr/share/samba, /var/lib/samba and /var/log/samba</seg>
      </seglistitem>