[kaya/f18: 5/6] Rebuilt kaya for new ghc-editline release

[Jochen Schmitt]

commit b7f07f192dbd3c3bb6e89dc199233b3948f72ad1
Merge: e11d17f 9f82393
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Thu Nov 29 09:55:29 2012 +0100

    Rebuilt kaya for new ghc-editline release

 kaya-0.5.2-ghc74-base.patch |  243 +++++++++++++++++++++++++++++++++++++++++++
 kaya.spec                   |   41 ++++++--
 2 files changed, 276 insertions(+), 8 deletions(-)
---
diff --cc kaya.spec
index d55a57c,b69ccd5..6c916ec
--- a/kaya.spec
+++ b/kaya.spec
@@@ -21,14 -21,13 +21,19 @@@ Patch3:		kaya-0.5.2-gc.patc
  Patch4:		kaya-0.5.2-dyn.patch
  Patch5:		kaya-0.5.2-codegen.patch
  Patch6:		kaya-0.5.2-gcc47.patch
+ Patch7:		kaya-0.5.2-ghc74-base.patch
  
- # fedora ghc has only been bootstrapped on the following archs:
- #ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9
- ExcludeArch:	sparc64 s390x
+ ExcludeArch:	sparc64
  
++<<<<<<< HEAD
 +BuildRequires:  libtool, autoconf, pkgconfig, ghc-devel, 
 +BuildRequires:	ghc >= 6.10.3, gc-devel, happy, zlib-devel, gnutls-devel
 +BuildRequires:  libgcrypt-devel, pcre-devel ghc-editline-devel
++=======
+ BuildRequires:  libtool, autoconf, pkgconfig
+ BuildRequires:	gc-devel, happy, zlib-devel, gnutls-devel
+ BuildRequires:  libgcrypt-devel, pcre-devel
++>>>>>>> master
  BuildRequires:	postgresql-devel, mysql-devel, sqlite-devel
  BuildRequires:  gd-devel, SDL-devel, mesa-libGL-devel
  BuildRequires:  ncurses-devel, freeglut-devel