Upgrade to Vim-7.0-fixes-14.patch and drop the spellfile patch as that is now included in the former.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7850 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

6 files changed, 22 insertions, 23 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 307cf2418..a1897c26a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,17 @@
 -->
 
     <listitem>
+      <para>2006-10-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Vim-7.0-fixes-14.patch.  Drop the
+          &quot;spellfile&quot; fix as it was applied upstream as patch
+          076.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2006-10-28</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index cddba58da..8a076e697 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -213,6 +213,9 @@
     <listitem>
       <para>&util-linux-lseek-patch;</para>
     </listitem>
+    <listitem>
+      <para>&vim-fixes-patch;</para>
+    </listitem>
   </itemizedlist>
 
   <itemizedlist>
@@ -251,6 +254,9 @@
     <listitem>
       <para>tar-1.15.1-sparse_fix-1.patch</para>
     </listitem>
+    <listitem>
+      <para>vim-7.0-fixes-7.patch</para>
+    </listitem>
 
   </itemizedlist>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index bbc41bc26..58e1bdf49 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -268,14 +268,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Vim Spellfile Patch - <token>&vim-spellfile-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&vim-spellfile-patch;"/></para>
-        <para>MD5 sum: <literal>&vim-spellfile-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
   </variablelist>
 
   <para>Total size of these patches: about <returnvalue/></para>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index db41ce00f..ec2993575 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -59,12 +59,6 @@
 
 <screen><userinput>patch -Np1 -i ../&vim-mandir-patch;</userinput></screen>
 
-    <para>There is an issue introduced by one of the upstream patches that
-    creates a problem downloading spellfiles via HTTP.  Until this is updated
-    by the developers, the following patch fixes the problem:</para>
-
-<screen><userinput>patch -Np1 -i ../&vim-spellfile-patch;</userinput></screen>
-
     <para>Finally, change the default location of the
     <filename>vimrc</filename> configuration file to <filename
     class="directory">/etc</filename>:</para>
diff --git a/general.ent b/general.ent
index d129257f5..7172c81cb 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20061028">
-<!ENTITY releasedate "October 28, 2006">
+<!ENTITY version "SVN-20061029">
+<!ENTITY releasedate "October 29, 2006">
 <!ENTITY milestone "6.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
diff --git a/patches.ent b/patches.ent
index 38b186b02..c1da4e59e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -133,14 +133,10 @@
 <!ENTITY util-linux-lseek-patch-md5 "5d6c86321c1ea74d7ed7cf57861da423">
 <!ENTITY util-linux-lseek-patch-size "10 KB">
 
-<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-7.patch">
-<!ENTITY vim-fixes-patch-md5 "d274219566702b0bafcb83ab4685bbde">
-<!ENTITY vim-fixes-patch-size "42 KB">
+<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-14.patch">
+<!ENTITY vim-fixes-patch-md5 "476481c274e056a3fb3cea002e903579">
+<!ENTITY vim-fixes-patch-size "288 KB">
 
 <!ENTITY vim-mandir-patch "vim-&vim-version;-mandir-1.patch">
 <!ENTITY vim-mandir-patch-md5 "b6426eb4192faba1e867ddd502323f5b">
 <!ENTITY vim-mandir-patch-size "4.2 KB">
-
-<!ENTITY vim-spellfile-patch "vim-&vim-version;-spellfile-1.patch">
-<!ENTITY vim-spellfile-patch-md5 "98e59e34cb6e16a8d4671247cebd64ee">
-<!ENTITY vim-spellfile-patch-size "1.2 KB">