--- rpms/booty/sme8/booty.spec	2008/03/18 22:33:40	1.3
+++ rpms/booty/sme8/booty.spec	2009/04/14 14:37:20	1.8
@@ -1,16 +1,17 @@
 Summary: simple python bootloader config lib
 Name: booty
-Version: 0.80.4
+Version: 0.80.6
 Release: 5
 License: LGPL
-Source0: %{name}-%{version}.tar.bz2
-Patch0: %{name}-0.80.4-multipath.patch
-Patch1: %{name}-0.80.4-ia64-vmm.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: rhpl
 BuildRequires: python-devel
 BuildArch: noarch
+Source0: %{name}-%{version}.tar.bz2
+Patch0: booty-0.80.4-multipath.patch
+Patch1: booty-0.80.4-bz464791-serial-init.patch
+Patch2: booty-0.80.6-no-ia64-com-on-vmm.patch
 
 %description
 Small python library for use with bootloader configuration by anaconda
@@ -19,8 +20,9 @@ and up2date.
 
 %prep
 %setup -q
-%patch0 -p 1 -b .multipath
-%patch1 -p1 -b .ia64-vmm
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 make
@@ -39,6 +41,35 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 07 2008 Peter Jones <pjones@redhat.com> - 0.80.6-5
+- Fix dropped changelog entries.
+  Related: rhbz#465454
+
+* Tue Oct 07 2008 Peter Jones <pjones@redhat.com> - 0.80.6-4
+- Don't specify "com=$SPEED" on vmm= line for ia64. 
+  Resolves: rhbz#465454
+
+* Tue Sep 30 2008 Peter Jones <pjones@redhat.com> - 0.80.6-3
+- Rework bootloaderInfo.serial's initialization.
+  Resolves: rhbz#464791
+
+* Fri Sep 26 2008 Peter Jones <pjones@redhat.com> - 0.80.6-2
+- Re-incorperate dropped changelog entries that rpmdiff caught, 
+  and dropped fix from 0.80.4-5.
+  Related: rhbz#462843
+
+* Thu Sep 25 2008 Peter Jones <pjones@redhat.com> - 0.80.6-1
+- Fix ia64 xen command line writing
+  Resolves: rhbz#462843
+
+* Mon Jul 21 2008 Dave Lehman <dlehman@redhat.com> - 0.80.5-1
+- Work correctly with root on LUKS encrypted device.
+  Resolves: rhbz#455343
+
+* Thu Feb 07 2008 Peter Jones <pjones@redhat.com> - 0.80.4-6
+- Fix installation of boot sector to partitions on dmraid devices.
+  Resolves: rhbz#236452
+
 * Tue Aug 14 2007 David Cantrell <dcantrell@redhat.com> - 0.80.4-5
 - Do not use LABEL= for non-dm devices, prevents boot failures
   Resolves: rhbz#250631