[bochs] 2.6.

[Jon Ciesla]

commit 6068572793463f71825671712a69024a0aaab5b7
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Sep 4 10:29:17 2012 -0500

    2.6.

 .gitignore |    1 +
 bochs.spec |   14 ++++++++++----
 sources    |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b4aca0e..99adb45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ bochs-2.4.5.cvs.tar.gz
 /bochs-2.4.6.tar.gz
 /bochs-2.5.tar.gz
 /bochs-2.5.1.tar.gz
+/bochs-2.6.tar.gz
diff --git a/bochs.spec b/bochs.spec
index 390841f..e2e1723 100644
--- a/bochs.spec
+++ b/bochs.spec
@@ -1,7 +1,7 @@
 %define _hardened_build 1
 Name:           bochs
-Version:        2.5.1
-Release:        5%{?dist}
+Version:        2.6
+Release:        1%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
 License:        LGPLv2+
@@ -16,7 +16,7 @@ Patch2: %{name}-0007_bios-add-26-pci-slots,-bringing-the-total-to-32.patch
 Patch3: %{name}-0008_qemu-bios-provide-gpe-_l0x-methods.patch
 Patch4: %{name}-0009_qemu-bios-pci-hotplug-support.patch
 #Patch5: %{name}-0011_read-additional-acpi-tables-from-a-vm.patch
-Patch6: %{name}-0012_remove_eh_frame_from_bios.patch
+#Patch6: %{name}-0012_remove_eh_frame_from_bios.patch
 Patch7: %{name}-nonet-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,7 +93,7 @@ Header and source files from bochs source.
 %patch3 -p1
 %patch4 -p1
 #%patch5 -p1
-%patch6 -p1
+#%patch6 -p1
 %patch7 -p0 -z .nonet
 
 # Fix up some man page paths.
@@ -132,6 +132,8 @@ CONFIGURE_FLAGS=" \
   --without-wx \
   --enable-cpu-level=6 \
   --enable-disasm \
+  --enable-usb \
+  --enable-usb-ohci \
   $ARCH_CONFIGURE_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS -DPARANOID"
 
@@ -215,6 +217,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/include/bochs/
 
 %changelog
+* Tue Sep 04 2012 Jon Ciesla <limburgher at gmail.com> - 2.6-1
+- Update to 2.6.
+- eh_frame patch upstreamed.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index da5078a..289a976 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4fe5325ec422a7f74dbb0adb52c76bb6  bochs-2.5.1.tar.gz
+7e25e1a4d2f7e0464e8d6381f38741d9  bochs-2.6.tar.gz