From 4e26a3bcc178ac047fa6237bfbc3252fe19c3d76 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Jan 15 2013 10:56:09 +0000 Subject: Fix 0110-usb-redir-Add-flow-control-support.patch being mangled on rebase to 1.3.0, breaking usbredir support --- diff --git a/0110-usb-redir-Add-flow-control-support.patch b/0110-usb-redir-Add-flow-control-support.patch index 914f7db..90a6522 100644 --- a/0110-usb-redir-Add-flow-control-support.patch +++ b/0110-usb-redir-Add-flow-control-support.patch @@ -32,7 +32,7 @@ index c921d2d..dfb1773 100644 } - return qemu_chr_fe_write(dev->cs, data, count); -+ r - qemu_chr_fe_write(dev->cs, data, count); ++ r = qemu_chr_fe_write(dev->cs, data, count); + + if (r < 0) { + if (dev->cs->write_blocked) { diff --git a/qemu.spec b/qemu.spec index 22174eb..2302acd 100644 --- a/qemu.spec +++ b/qemu.spec @@ -120,7 +120,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -1266,6 +1266,10 @@ fi %{_libdir}/pkgconfig/libcacard.pc %changelog +* Tue Jan 15 2013 Hans de Goede - 2:1.3.0-2 +- Fix 0110-usb-redir-Add-flow-control-support.patch being mangled on rebase + to 1.3.0, breaking usbredir support + * Fri Dec 07 2012 Cole Robinson - 2:1.3.0-1 - Switch base tarball from qemu-kvm to qemu - qemu 1.3 release