r8757 - in trunk/BOOK: basicnet/netutils general/prog gnome/add gnome/core introduction/welcome

randy at linuxfromscratch.org randy at linuxfromscratch.org
Mon Jan 3 12:46:44 PST 2011


Author: randy
Date: 2011-01-03 13:46:39 -0700 (Mon, 03 Jan 2011)
New Revision: 8757

Modified:
   trunk/BOOK/basicnet/netutils/avahi.xml
   trunk/BOOK/general/prog/python.xml
   trunk/BOOK/gnome/add/alacarte.xml
   trunk/BOOK/gnome/core/gnome-menus.xml
   trunk/BOOK/gnome/core/libgweather.xml
   trunk/BOOK/gnome/core/pre-install-config.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Added installing the environment variable PYTHONPATH to the GNOME Pre-Installation tasks, also changed hardcoded Python version instances to use an existing entity

Modified: trunk/BOOK/basicnet/netutils/avahi.xml
===================================================================
--- trunk/BOOK/basicnet/netutils/avahi.xml	2011-01-03 20:06:53 UTC (rev 8756)
+++ trunk/BOOK/basicnet/netutils/avahi.xml	2011-01-03 20:46:39 UTC (rev 8757)
@@ -191,7 +191,7 @@
         libavahi-core.{so,a}, libavahi-glib.{so,a}, libavahi-gobject.{so,a}, and
         libavahi-ui.{so,a}</seg>
         <seg>/etc/avahi/services,/usr/{include/avahi-{client,common,core,glib,
-        gobject,ui},lib/{avahi,python2.6/site-packages/{avahi,avahi_discover}},
+        gobject,ui},lib/{avahi,python&python-majorver;/site-packages/{avahi,avahi_discover}},
         share/avahi/{interfaces,introspection}}</seg>
       </seglistitem>
     </segmentedlist>

Modified: trunk/BOOK/general/prog/python.xml
===================================================================
--- trunk/BOOK/general/prog/python.xml	2011-01-03 20:06:53 UTC (rev 8756)
+++ trunk/BOOK/general/prog/python.xml	2011-01-03 20:46:39 UTC (rev 8757)
@@ -139,7 +139,7 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &&
-chmod -v 755 /usr/lib/libpython2.6.so.1.0</userinput></screen>
+chmod -v 755 /usr/lib/libpython&python-majorver;.so.1.0</userinput></screen>
 
     <para>There is no documentation installed using the instructions above.
     See the <filename>Doc/README.txt</filename> file in the source

Modified: trunk/BOOK/gnome/add/alacarte.xml
===================================================================
--- trunk/BOOK/gnome/add/alacarte.xml	2011-01-03 20:06:53 UTC (rev 8756)
+++ trunk/BOOK/gnome/add/alacarte.xml	2011-01-03 20:46:39 UTC (rev 8757)
@@ -103,7 +103,7 @@
       <seglistitem>
         <seg>alacarte</seg>
         <seg><application>Python</application> modules.</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{lib/python2.6/site-packages/Alacarte,
+        <seg><envar>$GNOME_PREFIX</envar>/{lib/python&python-majorver;/site-packages/Alacarte,
         share/{alacarte,icons/hicolor/256x256/apps,locale/bem/LC_MESSAGES}}</seg>
       </seglistitem>
     </segmentedlist>

Modified: trunk/BOOK/gnome/core/gnome-menus.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-menus.xml	2011-01-03 20:06:53 UTC (rev 8756)
+++ trunk/BOOK/gnome/core/gnome-menus.xml	2011-01-03 20:46:39 UTC (rev 8757)
@@ -152,8 +152,7 @@
         profile, or in individual user's profiles as shown below:</para>
 
 <screen role='root'><userinput>echo "export PYTHONPATH=\$PYTHONPATH:$(pkg-config \
---variable=prefix ORBit-2.0)/lib/python2.6/site-packages:$(pkg-config \
---variable=prefix ORBit-2.0)/lib/python2.6/site-packages/GMenuSimpleEditor" \
+--variable=prefix ORBit-2.0)/lib/python&python-majorver;/site-packages/GMenuSimpleEditor" \
 >> /etc/profile.d/gnome.sh</userinput></screen>
 
       </sect4>

Modified: trunk/BOOK/gnome/core/libgweather.xml
===================================================================
--- trunk/BOOK/gnome/core/libgweather.xml	2011-01-03 20:06:53 UTC (rev 8756)
+++ trunk/BOOK/gnome/core/libgweather.xml	2011-01-03 20:46:39 UTC (rev 8757)
@@ -130,7 +130,7 @@
         <seg>None</seg>
         <seg>libgweather.{so,a}</seg>
         <seg><envar>$GNOME_PREFIX</envar>/{include/libgweather,
-        lib/python2.6/site-packages/gweather/I_KNOW_THIS_IS_UNSTABLE,
+        lib/python&python-majorver;/site-packages/gweather/I_KNOW_THIS_IS_UNSTABLE,
         share/{gtk-doc/html/libgweather,libgweather}}</seg>
       </seglistitem>
     </segmentedlist>

Modified: trunk/BOOK/gnome/core/pre-install-config.xml
===================================================================
--- trunk/BOOK/gnome/core/pre-install-config.xml	2011-01-03 20:06:53 UTC (rev 8756)
+++ trunk/BOOK/gnome/core/pre-install-config.xml	2011-01-03 20:46:39 UTC (rev 8757)
@@ -52,7 +52,8 @@
 <screen><literal>export PATH=$PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/bin
 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/pkgconfig
 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/share/pkgconfig
-export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-version;&gnome-minor-version;/lib</literal></screen>
+export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-version;&gnome-minor-version;/lib
+export PYTHONPATH=$PYTHONPATH:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/python&python-majorver;/site-packages</literal></screen>
 
   <para>Add to your <filename>/etc/ld.so.conf</filename>:</para>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2011-01-03 20:06:53 UTC (rev 8756)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2011-01-03 20:46:39 UTC (rev 8757)
@@ -45,6 +45,11 @@
       <para>January 3rd, 2011</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Added installing the environment variable PYTHONPATH
+          to the GNOME Pre-Installation tasks, also changed hardcoded Python
+          version instances to use an existing entity.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to GNOME Doc Utils-0.20.2.</para>
         </listitem>
         <listitem>




More information about the blfs-book mailing list