From beffe145be48edbae8be785c9c95c1182ab415c6 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Jan 18 2012 11:33:22 +0000
Subject: Merge remote-tracking branch 'refs/remotes/origin/f16' into f15


---

diff --git a/alex.spec b/alex.spec
index d3a861b..0d24b78 100644
--- a/alex.spec
+++ b/alex.spec
@@ -1,17 +1,16 @@
 Name:           alex
-# part of haskell-platform-2011.1.0.0
+# part of haskell-platform-2011.2.0.1
 Version:        2.3.5
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        A lexer generator for Haskell
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-# fedora ghc archs:
-ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9 ppc64
-BuildRequires:  ghc-devel
-BuildRequires:  ghc-rpm-macros >= 0.7.0
+ExclusiveArch:  %{ghc_arches}
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros
 BuildRequires:  autoconf docbook-style-xsl libxslt
 
 %description
@@ -46,6 +45,13 @@ cd ..
 
 
 %changelog
+* Tue Jun 21 2011 Jens Petersen <petersen@redhat.com> - 2.3.5-5
+- ghc_arches replaces ghc_excluded_archs
+
+* Mon Jun 20 2011 Jens Petersen <petersen@redhat.com> - 2.3.5-4
+- BR ghc-Cabal-devel
+- use ghc_excluded_archs
+
 * Wed May 18 2011 Jens Petersen <petersen@redhat.com> - 2.3.5-3
 - add ppc64