From a6d8d36a6d22958c6f2dec9e021ad964c7b74ab9 Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Sep 16 2012 17:55:24 +0000 Subject: Further fix for RHBZ#855252. --- diff --git a/qemu.spec b/qemu.spec index 2bdbaa3..424e1e5 100644 --- a/qemu.spec +++ b/qemu.spec @@ -34,12 +34,12 @@ %bcond_without fdt # enabled %endif -%define SLOF-gittagdate 20120731 +%global SLOF_gittagdate 20120731 Summary: QEMU is a FAST! processor emulator Name: qemu Version: 1.2.0 -Release: 4%{?dist} +Release: 5%{?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 @@ -456,7 +456,7 @@ Summary: QEMU system emulator for PPC Group: Development/Tools Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: openbios -Requires: SLOF = 0.1.git%{SLOF-gittagdate} +Requires: SLOF = 0.1.git%{SLOF_gittagdate} %description system-ppc QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -1057,6 +1057,10 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Sun Sep 16 2012 Richard W.M. Jones - 2:1.2.0-5 +- Use 'global' instead of 'define', and underscore in definition name, + to fix RHBZ#855252. + * Fri Sep 14 2012 Paolo Bonzini - 2:1.2.0-4 - add versioned dependency from qemu-system-ppc to SLOF (BZ#855252)