Attachment 924549 Details for Bug 1127351 – Fix xwayland conditionals for Fedora 20

[patch] Fix xwayland conditionals for Fedora 20

0001-Fix-conditionals-for-Fedora-20.patch (text/plain), 1.53 KB, created by Michael Kuhn on 2014-08-06 17:52:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Kuhn

Created: 2014-08-06 17:52:53 UTC

Size: 1.53 KB

patch

obsolete

>From d4f9b559986a23103141008b69ddd0385cc70db2 Mon Sep 17 00:00:00 2001
>From: Michael Kuhn <suraia@ikkoku.de>
>Date: Wed, 6 Aug 2014 19:47:09 +0200
>Subject: [PATCH] Fix conditionals for Fedora 20.
>
>---
> xorg-x11-server.spec | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
>index efc00c3..f359aaa 100644
>--- a/xorg-x11-server.spec
>+++ b/xorg-x11-server.spec
>@@ -142,7 +142,9 @@ BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel
> BuildRequires: libXi-devel libXpm-devel libXaw-devel libXfixes-devel
> 
> %if !0%{?rhel}
>+%if 0%{?fedora} > 20
> BuildRequires: wayland-devel pkgconfig(wayland-client) pkgconfig(epoxy)
>+%endif
> BuildRequires: pkgconfig(xshmfence) >= 1.1
> %endif
> BuildRequires: libXv-devel
>@@ -314,7 +316,7 @@ X protocol, and therefore supports the newer X extensions like
> Render and Composite.
> 
> 
>-%if !0%{?rhel} || 0%{?fedora} > 20
>+%if !0%{?rhel} && 0%{?fedora} > 20
> %package Xwayland
> Summary: Wayland X Sserver.
> Group: User Interface/X
>@@ -414,7 +416,7 @@ test `getminor extension` == %{extension_minor}
> 
> %if 0%{?fedora}
> %global bodhi_flags --with-vendor-name="Fedora Project"
>-%if 0%{?fedora} > 20
>+%if !0%{?rhel} && 0%{?fedora} > 20
> %global wayland --enable-xwayland
> %else
> %global wayland --disable-xwayland
>@@ -612,7 +614,7 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
> %{_bindir}/Xephyr
> %{_mandir}/man1/Xephyr.1*
> 
>-%if !0%{?rhel} || 0%{?fedora} < 21
>+%if !0%{?rhel} && 0%{?fedora} > 20
> %files Xwayland
> %{_bindir}/Xwayland
> %endif
>-- 
>2.0.4
>

Actions: View | Diff

Attachments on bug 1127351: 924549