[xorg-x11-drv-qxl/f19] Fix with_xspice macro definition

Dave Airlie airlied at fedoraproject.org
Tue May 14 01:39:57 UTC 2013


commit 460edf355f95b3a2e5c8214015d2ee0e12a08bed
Author: Colin Walters <walters at verbum.org>
Date:   Sat May 4 17:58:57 2013 -0400

    Fix with_xspice macro definition
    
    Conflicts:
    	xorg-x11-drv-qxl.spec

 xorg-x11-drv-qxl.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-qxl.spec b/xorg-x11-drv-qxl.spec
index a0520c2..8662af4 100644
--- a/xorg-x11-drv-qxl.spec
+++ b/xorg-x11-drv-qxl.spec
@@ -4,7 +4,7 @@
 
 # Xspice is x86_64 only since spice-server is x86_64 only
 %ifarch x86_64
-%define with_xspice 0%{?fedora} || 0%{?rhel} > 6
+%define with_xspice (0%{?fedora} || 0%{?rhel} > 6)
 %else
 %define with_xspice 0
 %endif
@@ -22,7 +22,7 @@ Name:      xorg-x11-drv-qxl
 
 Version:   0.1.1
 
-Release:   0.5%{?gver}%{?dist}
+Release:   0.6%{?gver}%{?dist}
 URL:       http://www.x.org
 #Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 
@@ -123,6 +123,9 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/spiceqxl.xorg.conf
 
 
 %changelog
+* Sat May 14 2013 Daniel Mach <dmach at redhat.com> - 0.1.1-0.6
+- Fix with_xspice macro definition (airlied - cherrypick)
+
 * Tue May 7 2013 Alon Levy <alevy at redhat.com> 0.1.1-0.5
 - Add Xspice fixes and dfps (upstream a474a71..77a1594)
 


More information about the scm-commits mailing list