[ghc-xmonad-contrib] condition X11-1.6 patch to fedora >= 18

Jens Petersen petersen at fedoraproject.org
Sat Nov 17 04:55:09 UTC 2012


commit 9903afa2b4d8242f14be1780c7f7141ca2dd391c
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Nov 17 13:55:02 2012 +0900

    condition X11-1.6 patch to fedora >= 18

 ghc-xmonad-contrib.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec
index 07e5ea9..40347c1 100644
--- a/ghc-xmonad-contrib.spec
+++ b/ghc-xmonad-contrib.spec
@@ -61,7 +61,9 @@ BuildRequires:  ghc-xmonad-devel
 %patch2 -p1 -b .orig-NET_WM_STATE
 %patch3 -p1 -b .orig-mouseborder
 %patch4 -p1 -b .orig-rescale
+%if 0%{?fedora} >= 18
 %patch5 -p1 -b .orig-X11
+%endif
 %patch6 -p1 -b .orig-Focus
 
 
@@ -89,6 +91,7 @@ BuildRequires:  ghc-xmonad-devel
 * Sat Nov 17 2012 Jens Petersen <petersen at redhat.com> - 0.10-7
 - add ICCCMFocus patch from upstream for WM_TAKE_FOCUS move to core (#874855)
 - use a patch for use_xft flag
+- condition X11-1.6 patch to fedora >= 18
 - update packaging with cabal-rpm
 
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-6


More information about the scm-commits mailing list