From 5cc23954938f57808d88c75198a69dfc3b33bf16 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 11 Apr 2018 21:37:07 +0000
Subject: Fix appdata.loc file in gettext. Update to linux-4.16.1. Update to
 procps-ng-3.3.14.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11399 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/gettext.xml       | 17 +++++++++++++++--
 chapter06/revisedchroot.xml | 10 +++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index 630febf1d..1213b2265 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -43,15 +43,28 @@
   <sect2 role="installation">
     <title>Installation of Gettext</title>
 
-   <!-- this has been fixed in upstream gnulib, when a new version of
+   <!-- This has been fixed in upstream gnulib, when a new version of
    gettext is released, please check #4055 to see if the change has been
-   picked up in this package -->
+   picked up in this package 
+   
+   As of April 11, 2018, 'TESTS = test-lock' is in gettext-runtime/tests/Makefile.am
+   Perhaps the test is fixed.
+
+   There is no reference to 'test' or TEST in  gettext-tools/gnulib-tests/Makefile.am
+   -->
    <para>First, suppress two invocations of test-lock which on some machines
    can loop forever:</para>
 
 <screen><userinput remap="pre">sed -i '/^TESTS =/d' gettext-runtime/tests/Makefile.in &amp;&amp;
 sed -i 's/test-lock..EXEEXT.//' gettext-tools/gnulib-tests/Makefile.in</userinput></screen>
 
+   <!-- As of April 11, 2018 appdata.* is NOT in git master, but appears
+   to be in metainfo.{its,loc},  When updating, check BLFS gnome-screenshot. -->
+   <para>Now fix a configuration file:</para>
+
+<screen><userinput remap="pre">sed -e '/AppData/N;N;p;s/\.appdata\./.metainfo./' \
+    -i gettext-tools/its/appdata.loc</userinput></screen>
+
     <para>Prepare Gettext for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr    \
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index db361a6eb..8436600f0 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -55,12 +55,12 @@ rm -f /usr/lib/libfl.a
 rm -f /usr/lib/libfl_pic.a
 rm -f /usr/lib/libz.a</userinput></screen>
 
-  <para>There are also several files installed in the /usr/lib directory with a
-  file name extention of .la.  These are "libtool archive" files and generally
-  unneeded on a linux system.  None of these are necessary at this point.  To
-  remove them, run:</para>
+  <para>There are also several files installed in the /usr/lib and /usr/libexec
+  directories with a file name extention of .la. These are "libtool archive"
+  files and generally unneeded on a linux system. None of these are necessary
+  at this point. To remove them, run:</para>
 
-<screen><userinput>find /usr/lib -name \*.la -delete</userinput></screen>
+<screen><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput></screen>
 
    <para>For more information about libtool archive files, see the <ulink
    url="&blfs-book;/introduction/la-files.html">BLFS section "About Libtool
-- 
cgit v1.2.3-54-g00ecf