Author: pierre
Date: Sat Jan 12 13:06:52 2019
New Revision: 20966
Log:
Make coherent dependencies for Python Modules, see ticket #11425
Modified:
trunk/BOOK/general/prog/lxml.xml
trunk/BOOK/general/prog/pyatspi2.xml
trunk/BOOK/general/prog/pycrypto.xml
trunk/BOOK/general/prog/pygobject2.xml
trunk/BOOK/general/prog/pygtk.xml
trunk/BOOK/general/prog/pyxdg.xml
trunk/BOOK/general/prog/scour.xml
trunk/BOOK/introduction/welcome/changelog.xml
Modified: trunk/BOOK/general/prog/lxml.xml
==============================================================================
--- trunk/BOOK/general/prog/lxml.xml Sat Jan 12 12:21:56 2019 (r20965)
+++ trunk/BOOK/general/prog/lxml.xml Sat Jan 12 13:06:52 2019 (r20966)
@@ -73,6 +73,11 @@
<xref linkend="libxslt"/>
</para>
+ <bridgehead renderas="sect5">Recommended</bridgehead>
+ <para role="recommended">
+ <xref linkend="python2"/>
+ </para>
+
<bridgehead renderas="sect5">Optional (to run more tests)</bridgehead>
<para role="optional">
<xref linkend="gdb"/>
Modified: trunk/BOOK/general/prog/pyatspi2.xml
==============================================================================
--- trunk/BOOK/general/prog/pyatspi2.xml Sat Jan 12 12:21:56 2019
(r20965)
+++ trunk/BOOK/general/prog/pyatspi2.xml Sat Jan 12 13:06:52 2019
(r20966)
@@ -10,7 +10,7 @@
"&gnome-download-ftp;/pyatspi/2.30/pyatspi-&pyatspi2-version;.tar.xz">
<!ENTITY pyatspi2-md5sum "2b588e226bfce50669ed6466d8a2d3b4">
<!ENTITY pyatspi2-size "304 KB">
- <!ENTITY pyatspi2-buildsize "5.1 MB">
+ <!ENTITY pyatspi2-buildsize "3.6 MB">
<!ENTITY pyatspi2-time "less than 0.1 SBU">
]>
@@ -81,6 +81,11 @@
<xref linkend="at-spi2-core"/>
</para>
+ <bridgehead renderas="sect5">Optional</bridgehead>
+ <para role="optional">
+ <xref linkend="python2"/>
+ </para>
+
<para condition="html" role="usernotes">
User Notes: <ulink url="&blfs-wiki;/pyatspi2"/>
</para>
@@ -90,55 +95,25 @@
<sect3 role="installation">
<title>Installation of PyAtSpi2</title>
- <note>
- <para>
- Both <application>Python 2</application> and
- <application>Python 3</application> modules can
- be built and installed without any conflicts.
- </para>
- </note>
-
- <para>
- To build <application>PyAtSpi2</application> as the
- <application>Python 2</application> module, run the
- following commands:
- </para>
-
-<screen><userinput>mkdir python2 &&
-pushd python2 &&
-../configure --prefix=/usr --with-python=/usr/bin/python &&
-popd</userinput></screen>
-
<para>
- To build <application>PyAtSpi2</application> as the
+ To build <application>PyAtSpi2</application> as a
<application>Python 3</application> module, run the
following commands:
</para>
-<screen><userinput>mkdir python3 &&
-pushd python3 &&
-../configure --prefix=/usr --with-python=/usr/bin/python3 &&
-popd</userinput></screen>
+<screen><userinput>./configure --prefix=/usr
--with-python=/usr/bin/python3</userinput></screen>
<para>
This package does not come with a testsuite.
</para>
<para>
- To install the <application>Python 2</application> module,
- run the following command as the
- <systemitem class="username">root</systemitem> user:
- </para>
-
-<screen role="root"><userinput>make -C python2 install</userinput></screen>
-
- <para>
To install the <application>Python 3</application> module,
run the following command as the
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>make -C python3 install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
</sect3>
Modified: trunk/BOOK/general/prog/pycrypto.xml
==============================================================================
--- trunk/BOOK/general/prog/pycrypto.xml Sat Jan 12 12:21:56 2019
(r20965)
+++ trunk/BOOK/general/prog/pycrypto.xml Sat Jan 12 13:06:52 2019
(r20966)
@@ -68,8 +68,8 @@
<bridgehead renderas="sect4">PyCrypto Dependencies</bridgehead>
- <bridgehead renderas="sect5">Optional</bridgehead>
- <para role="optional">
+ <bridgehead renderas="sect5">Recommended</bridgehead>
+ <para role="recommended">
<xref linkend="python2"/>
</para>
Modified: trunk/BOOK/general/prog/pygobject2.xml
==============================================================================
--- trunk/BOOK/general/prog/pygobject2.xml Sat Jan 12 12:21:56 2019
(r20965)
+++ trunk/BOOK/general/prog/pygobject2.xml Sat Jan 12 13:06:52 2019
(r20966)
@@ -82,8 +82,9 @@
<bridgehead renderas="sect5">Required</bridgehead>
<para role="required">
- <xref linkend="glib2"/> and
- <xref linkend="pycairo"/> (Python 2)
+ <xref linkend="glib2"/>,
+ <xref linkend="pycairo"/> (Python 2), and
+ <xref linkend="python2"/>
</para>
<bridgehead renderas="sect5">Optional</bridgehead>
Modified: trunk/BOOK/general/prog/pygtk.xml
==============================================================================
--- trunk/BOOK/general/prog/pygtk.xml Sat Jan 12 12:21:56 2019 (r20965)
+++ trunk/BOOK/general/prog/pygtk.xml Sat Jan 12 13:06:52 2019 (r20966)
@@ -71,7 +71,8 @@
<bridgehead renderas="sect5">Required</bridgehead>
<para role="required">
- <xref linkend="pygobject2"/>
+ <xref linkend="pygobject2"/> and
+ <xref linkend="python2"/>
</para>
<bridgehead renderas="sect5">Required (atk module)</bridgehead>
Modified: trunk/BOOK/general/prog/pyxdg.xml
==============================================================================
--- trunk/BOOK/general/prog/pyxdg.xml Sat Jan 12 12:21:56 2019 (r20965)
+++ trunk/BOOK/general/prog/pyxdg.xml Sat Jan 12 13:06:52 2019 (r20966)
@@ -81,27 +81,10 @@
<sect3 role="installation">
<title>Installation of PyXDG</title>
- <note>
- <para>
- Both <application>Python 2</application> and
- <application>Python 3</application> modules can
- be built and installed without any conflicts.
- </para>
- </note>
-
<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
<para>
- To install the <application>Python 2</application> module,
- run the following command as the
- <systemitem class="username">root</systemitem> user:
- </para>
-
-<screen role="root"><userinput>python setup.py install
--optimize=1</userinput></screen>
-
- <para>
- To install the <application>Python 3</application> module,
- run the following command as the
+ To install the module, run the following command as the
<systemitem class="username">root</systemitem> user:
</para>
@@ -117,7 +100,6 @@
<seglistitem>
<seg>
- /usr/lib/python&python2-majorver;/site-packages/xdg and/or
/usr/lib/python&python3-majorver;/site-packages/xdg
</seg>
</seglistitem>
Modified: trunk/BOOK/general/prog/scour.xml
==============================================================================
--- trunk/BOOK/general/prog/scour.xml Sat Jan 12 12:21:56 2019 (r20965)
+++ trunk/BOOK/general/prog/scour.xml Sat Jan 12 13:06:52 2019 (r20966)
@@ -96,25 +96,20 @@
<sect3 role="installation">
<title>Installation of scour</title>
- <note>
- <para>
- Although this package installs modules for <application>Python
- 2</application> <emphasis>or</emphasis> <application>Python
- 3</application> they are usually invoked by <command>scour</command>
- which is a script using the version of
- <application>Python</application> for which it was compiled.
- </para>
+ <note>
<para>
- For the moment, use of <application>Python 2</application> will
- normally be adequate.
+ Both <application>Python 2</application> and
+ <application>Python 3</application> modules can
+ be built and installed without any conflicts.
</para>
</note>
-<!-- Editors note: Use \-\-root= instead of DESTDIR= when updating. -->
+<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
<para>
- To build the <application>Python 2</application> module, issue:
+ To build the <application>Python 2</application> module,
+ run the following command:
</para>
<screen><userinput>python setup.py build</userinput></screen>
@@ -133,12 +128,20 @@
<screen role="root"><userinput>python setup.py install
--optimize=1</userinput></screen>
- <note>
- <para>
- If you wish to install the <application>Python 3</application>
- modules, change 'python' to 'python3' in each of the above steps.
- </para>
- </note>
+ <para>
+ To build the <application>Python 3</application> module,
+ run the following command:
+ </para>
+
+<screen><userinput>python3 setup.py build</userinput></screen>
+
+ <para>
+ To install the <application>Python 3</application> module,
+ run the following command as the
+ <systemitem class="username">root</systemitem> user:
+ </para>
+
+<screen role="root"><userinput>python3 setup.py install
--optimize=1</userinput></screen>
</sect3>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sat Jan 12 12:21:56
2019 (r20965)
+++ trunk/BOOK/introduction/welcome/changelog.xml Sat Jan 12 13:06:52
2019 (r20966)
@@ -50,6 +50,16 @@
<ulink url="&blfs-ticket-root;11091">#11091</ulink>.</para>
</listitem>
<listitem>
+ <para>[pierre] - Finish refactoring of the Python modules page:
+ pyatspi2: only P3, pycrypto: make P2 recommended,
+ pygobject2: make P2 required,
+ pygtk: make P2 required,
+ pyxdg: only P3,
+ lxml: make P2 recommended,
+ scour: make P2 recommended and add P3 instructions. Fixes
+ <ulink url="&blfs-ticket-root;11425">#11425</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[renodr] - Update to gnome-terminal-3.30.2. Partially fixes
<ulink url="&blfs-ticket-root;11091">#11091</ulink>.</para>
</listitem>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
