rpms/alex/devel alex-2.3-base3.patch,NONE,1.1 alex.spec,1.9,1.10

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/alex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30338

Modified Files:
	alex.spec 
Added Files:
	alex-2.3-base3.patch 
Log Message:
add alex-2.3-base3.patch to build with base-3 for ghc-6.10.1

alex-2.3-base3.patch:

--- NEW FILE alex-2.3-base3.patch ---
diff -u alex-2.3/alex.cabal.orig alex-2.3/alex.cabal
--- alex-2.3/alex.cabal.orig	2008-10-13 18:31:15.000000000 +1000
+++ alex-2.3/alex.cabal	2008-11-25 14:36:52.000000000 +1000
@@ -50,18 +50,12 @@
 	tests/tokens_gscan.x
 	tests/tokens_posn.x
 
-flag small_base
-  description: Choose the new smaller, split-up base package.
-
 executable alex
   executable: alex
   hs-source-dirs: src
   main-is: Main.hs
 
-  if flag(small_base)
-    build-depends: base >= 2.1, array, containers, directory
-  else
-    build-depends: base >= 1.0
+  build-depends: base == 3.*, array, containers, directory
 
   build-depends: haskell98 >= 1.0
 

Diff finished.  Tue Nov 25 14:37:02 2008


Index: alex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alex/devel/alex.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- alex.spec	25 Nov 2008 04:09:50 -0000	1.9
+++ alex.spec	25 Nov 2008 04:42:36 -0000	1.10
@@ -12,8 +12,8 @@
 Source:         http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch:  i386 x86_64 ppc
-
 BuildRequires:  autoconf ghc docbook-style-xsl libxslt
+Patch1:         alex-2.3-base3.patch
 
 %description
 Alex is a tool for generating lexical analysers in Haskell, given a
@@ -23,6 +23,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .orig
 
 
 %build
@@ -56,6 +57,7 @@
 * Tue Nov 25 2008 Jens Petersen <petersen at redhat.com> - 2.3-2
 - build with new macros
 - update urls to point to hackage
+- add alex-2.3-base3.patch to build with base-3 for ghc-6.10.1
 
 * Mon Oct 13 2008 Bryan O'Sullivan <bos at serpentine.com> - 2.3-1
 - Update to 2.3