Add a patch to fix incorrect version numbers in Bzip2. Thanks to Jeremy Huntwork (LightCube OS) for the patch.

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

chapter01/changelog.xml

@@ -36,6 +36,17 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2010-05-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Add a patch to fix incorrect version numbers in
+          Bzip2.  Thanks to Jeremy Huntwork (LightCube OS) for the patch.  Fixes
+          <ulink url="&lfs-ticket-root;2624">#2624</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2010-05-06</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -217,6 +217,10 @@
       <para>bash-4.1-fixes-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>bzip2-1.0.5-version_fixes-1.patch</para>
+    </listitem>
+
     <listitem>
       <para>MPC-&mpc-version;</para>
     </listitem>

chapter03/patches.xml

@@ -42,6 +42,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Bzip2 Version Fixes Patch - <token>&bzip2-version-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&bzip2-version-patch;"/></para>
+        <para>MD5 sum: <literal>&bzip2-version-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Coreutils Internationalization Fixes Patch - <token>&coreutils-i18n-patch-size;</token>:</term>
       <listitem>

chapter06/bzip2.xml

@@ -43,9 +43,11 @@
   <sect2 role="installation">
     <title>Installation of Bzip2</title>
 
-    <para>Apply a patch to install the documentation for this package:</para>
+    <para>Apply 2 patches that will install the documentation for this package
+    and correct some hard-coded version numbers:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&bzip2-docs-patch;
+patch -Np1 -i ../&bzip2-version-patch;</userinput></screen>
 
    <para>The following command ensures installation of symbolic links are relative:</para>
 

general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20100506">
-<!ENTITY releasedate "May 6, 2010">
+<!ENTITY version "SVN-20100521">
+<!ENTITY releasedate "May 19, 2010">
 <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.7">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

patches.ent

@@ -16,6 +16,10 @@
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
 
+<!ENTITY bzip2-version-patch "bzip2-&bzip2-version;-version_fixes-1.patch">
+<!ENTITY bzip2-version-patch-md5 "5ef00b9da463b399f3d67ecfa276e7ea">
+<!ENTITY bzip2-version-patch-size "5.3 KB">
+
 
 <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
 <!ENTITY coreutils-i18n-patch-md5 "13699e7e1c2ab2165dbe9f35c047e804">