From f222201badd118787e0c56fe7d9e1fa4865cc09c Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Jan 24 2017 17:04:40 +0000 Subject: Build on the same arches as spice-server --- diff --git a/xorg-x11-drv-qxl.spec b/xorg-x11-drv-qxl.spec index 07fedee..66fbe6e 100644 --- a/xorg-x11-drv-qxl.spec +++ b/xorg-x11-drv-qxl.spec @@ -5,7 +5,7 @@ %undefine _hardened_build # Xspice is x86_64 and ARM only since spice-server is x86_64 / ARM only -%ifarch x86_64 %{arm} aarch64 +%ifarch %{ix86} x86_64 %{arm} aarch64 %define with_xspice (0%{?fedora} || 0%{?rhel} > 6) %else %define with_xspice 0 @@ -24,7 +24,7 @@ Name: xorg-x11-drv-qxl Version: 0.1.5 -Release: 1%{?gver}%{?dist} +Release: 2%{?gver}%{?dist} URL: http://www.x.org Source0: http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2 #Source0: %{tarball}-%{gitdate}.tar.bz2 @@ -41,7 +41,7 @@ BuildRequires: xorg-x11-server-devel >= 1.1.0-1 BuildRequires: spice-protocol >= 0.12.1 BuildRequires: libdrm-devel >= 2.4.46-1 -%ifarch x86_64 %{arm} aarch64 +%if %{with_xspice} BuildRequires: spice-server-devel >= 0.8.0 %endif BuildRequires: glib2-devel @@ -88,7 +88,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' # should be fixed in upstream Makefile.am or whatever. find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- -%ifarch x86_64 %{arm} aarch64 +%if %{with_xspice} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11 install -p -m 644 examples/spiceqxl.xorg.conf.example \ $RPM_BUILD_ROOT%{_sysconfdir}/X11/spiceqxl.xorg.conf @@ -116,6 +116,9 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/spiceqxl.xorg.conf %changelog +* Tue Dec 20 2016 Christophe Fergeau 0.1.5-2 +- Build on the same arches as spice-server + * Mon Dec 19 2016 Christophe Fergeau 0.1.5-1%{?gver}%{?dist} - Update to latest upstream release. All patches except one have been upstreamed.