[xorg-x11-drv-qxl] Exclude Xspice from RHEL6 builds

[Adam Jackson]

commit c74ddac25a52aa3039863c286226a5b20c7f8cc4
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Aug 29 11:23:47 2012 -0400

    Exclude Xspice from RHEL6 builds

 xorg-x11-drv-qxl.spec |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/xorg-x11-drv-qxl.spec b/xorg-x11-drv-qxl.spec
index 38a30c4..4d116a0 100644
--- a/xorg-x11-drv-qxl.spec
+++ b/xorg-x11-drv-qxl.spec
@@ -4,6 +4,13 @@
 %define gitdate 20120718
 %define gitversion de6620788
 
+# Xspice is x86_64 only since spice-server is x86_64 only
+%ifarch x86_64
+%define with_xspice 0%{?fedora} || 0%{?rhel} > 6
+%else
+%define with_xspice 0
+%endif
+
 %if 0%{?gitdate}
 %define gver .%{gitdate}git%{gitversion}
 %endif
@@ -15,7 +22,7 @@ Name:      xorg-x11-drv-qxl
 Version:   0.0.22
 %define tarversion 0.0.17
 
-Release:   3%{?gver}%{?dist}
+Release:   4%{?gver}%{?dist}
 URL:       http://www.x.org
 #Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{tarversion}.tar.bz2
 Source0: %{tarball}-%{gitdate}.tar.bz2
@@ -43,7 +50,7 @@ Requires: Xorg %(xserver-sdk-abi-requires videodrv)
 %description 
 X.Org X11 qxl video driver.
 
-
+%if %{with_xspice}
 %package -n    xorg-x11-server-Xspice
 Summary:       XSpice is an X server that can be accessed by a Spice client
 Requires:      Xorg %(xserver-sdk-abi-requires ansic)
@@ -52,8 +59,8 @@ Requires:      xorg-x11-server-Xorg
 Requires:      python >= 2.6
 
 %description -n xorg-x11-server-Xspice
-XSpice is both an X and a Spice server.a
-
+XSpice is both an X and a Spice server.
+%endif
 
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{tarversion}}
@@ -64,12 +71,10 @@ autoreconf -f -i
 
 
 %build
-# Xspice is x86_64 only since spice-server is x86_64 only
-%ifarch x86_64
-%configure --enable-xspice --disable-static
-%else
-%configure --disable-static
+%if %{with_xspice}
+%define enable_xspice --enable-xspice
 %endif
+%configure --disable-static %{?enable_xspice}
 make %{?_smp_mflags}
 
 
@@ -87,7 +92,10 @@ install -p -m 644 examples/spiceqxl.xorg.conf.example \
 # FIXME: upstream installs this file by default, we install it elsewhere.
 # upstream should just not install it and let dist package deal with
 # doc/examples.
-rm $RPM_BUILD_ROOT/usr/share/doc/xf86-video-qxl/spiceqxl.xorg.conf.example
+rm -f $RPM_BUILD_ROOT/usr/share/doc/xf86-video-qxl/spiceqxl.xorg.conf.example
+%if !%{with_xspice}
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/spiceqxl.xorg.conf
+%endif
 %endif
 
 
@@ -96,19 +104,20 @@ rm $RPM_BUILD_ROOT/usr/share/doc/xf86-video-qxl/spiceqxl.xorg.conf.example
 %doc COPYING README
 %{driverdir}/qxl_drv.so
 
-%ifarch x86_64
-
+%if %{with_xspice}
 %files -n xorg-x11-server-Xspice
 %defattr(-,root,root,-)
 %doc COPYING README.xspice README examples/spiceqxl.xorg.conf.example
 %config(noreplace) %{_sysconfdir}/X11/spiceqxl.xorg.conf
 %{_bindir}/Xspice
 %{driverdir}/spiceqxl_drv.so
-
 %endif
 
 
 %changelog
+* Wed Aug 29 2012 Adam Jackson <ajax at redhat.com> 0.0.22-4
+- Exclude Xspice from RHEL6 builds
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.22-3.20120718gitde6620788
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild