[xorg-x11-server] Really fix conditionals to allow building on F-20 (rhbz#1127351)

Hans de Goede jwrdegoede at fedoraproject.org
Fri Aug 8 06:48:04 UTC 2014


commit a9ad36eddda53e59ae67636c38369af205b6da62
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Aug 8 08:47:58 2014 +0200

    Really fix conditionals to allow building on F-20 (rhbz#1127351)

 xorg-x11-server.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 12db821..7c14539 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -42,7 +42,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.16.0
-Release:   2%{?gitdate:.%{gitdate}}%{dist}
+Release:   3%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -143,6 +143,8 @@ BuildRequires: libXi-devel libXpm-devel libXaw-devel libXfixes-devel
 
 %if 0%{?fedora} > 20
 BuildRequires: wayland-devel pkgconfig(wayland-client) pkgconfig(epoxy)
+%endif
+%if !0%{?rhel}
 BuildRequires: pkgconfig(xshmfence) >= 1.1
 %endif
 BuildRequires: libXv-devel
@@ -633,6 +635,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Fri Aug  8 2014 Hans de Goede <hdegoede at redhat.com> - 1.16.0-3
+- Really fix conditionals to allow building on F-20 (rhbz#1127351)
+
 * Thu Aug  7 2014 Hans de Goede <hdegoede at redhat.com> - 1.16.0-2
 - Fix xwayland conditionals to allow building on F-20 (rhbz#1127351)
 


More information about the scm-commits mailing list