From 6f2cc22cf3048c0f8b05b445a33bc99425758204 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 7 Dec 2008 11:37:24 +0000
Subject: Upgrade to Automake-1.10.2. Fixes #2286.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8756 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 10 ++++++++++
 chapter01/whatsnew.xml  | 10 +++-------
 chapter03/patches.xml   |  8 --------
 chapter06/automake.xml  |  6 ------
 general.ent             |  4 ++--
 packages.ent            |  6 +++---
 patches.ent             |  5 -----
 7 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 73ff0326d..0da3bcbdf 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,16 @@
     </listitem>
 
 -->
+
+    <listitem>
+      <para>2008-12-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgraded to Automake-1.10.2.  Fixes #2286.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2008-12-04</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 5d3de12ff..06d467fec 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -23,16 +23,12 @@
     <title>Upgraded to:</title>
 
 
-    <listitem>
-      <para>None yet</para>
-    </listitem>
-
     <!--<listitem>
       <para>Autoconf &autoconf-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Automake &automake-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bash &bash-version;</para>
     </listitem>-->
@@ -222,7 +218,7 @@
     <title>Removed:</title>
 
     <listitem>
-      <para>None yet</para>
+      <para>automake-1.10.1-test_fix-1.patch</para>
     </listitem>
 
   </itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 9f7586c26..84f62cb98 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -18,14 +18,6 @@
 
   <variablelist role="materials">
 
-    <varlistentry>
-      <term>Automake Test Suite Patch - <token>&automake-test-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&automake-test-patch;"/></para>
-        <para>MD5 sum: <literal>&automake-test-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 8695a9ee6..b2b59564a 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -41,12 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Automake</title>
 
-    <para>Patch a test in the Automake test suite to fix an issue that occurs
-    when running the tests as <systemitem class="username">root</systemitem>:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&automake-test-patch;</userinput></screen>
-
     <para>Prepare Automake for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
diff --git a/general.ent b/general.ent
index f20e9ddf4..65fc2173c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20081204">
-<!ENTITY releasedate "December 4, 2008">
+<!ENTITY version "SVN-20081206">
+<!ENTITY releasedate "December 6, 2008">
 <!ENTITY copyrightdate "1999-2008"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 9e9cffc02..ac01c7c32 100644
--- a/packages.ent
+++ b/packages.ent
@@ -15,10 +15,10 @@
 <!ENTITY autoconf-ch6-du "14.3 MB testsuite included">
 <!ENTITY autoconf-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY automake-version "1.10.1">
-<!ENTITY automake-size "897 KB">
+<!ENTITY automake-version "1.10.2">
+<!ENTITY automake-size "914 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.bz2">
-<!ENTITY automake-md5 "4510391e6b3edaa4cffb3ced87c9560c">
+<!ENTITY automake-md5 "1498208ab1c8393dcbd9afb7d06df6d5">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-ch6-du "7.9 MB">
 <!ENTITY automake-ch6-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 352d60e7a..7e04c05bb 100644
--- a/patches.ent
+++ b/patches.ent
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!-- Start of Common Patches -->
-<!ENTITY automake-test-patch "automake-&automake-version;-test_fix-1.patch">
-<!ENTITY automake-test-patch-md5 "4d8aa269951bb3cd876d2bb663cb04cc">
-<!ENTITY automake-test-patch-size "3 KB">
-
-
 <!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-8.patch">
 <!ENTITY bash-fixes-patch-md5 "7729e8bb1adb57c8d3c4c3a34a5bbab0">
 <!ENTITY bash-fixes-patch-size "66 KB">
-- 
cgit v1.2.3-54-g00ecf