From b68e2d0b63fb75d6742e4b19cc55b2b2763ad3b4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 25 Nov 2008 04:42:36 +0000 Subject: [PATCH] add alex-2.3-base3.patch to build with base-3 for ghc-6.10.1 --- alex-2.3-base3.patch | 25 +++++++++++++++++++++++++ alex.spec | 4 +++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 alex-2.3-base3.patch diff --git a/alex-2.3-base3.patch b/alex-2.3-base3.patch new file mode 100644 index 0000000..064dcf6 --- /dev/null +++ b/alex-2.3-base3.patch @@ -0,0 +1,25 @@ +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 diff --git a/alex.spec b/alex.spec index 73c0584..05ab165 100644 --- a/alex.spec +++ b/alex.spec @@ -12,8 +12,8 @@ URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/alex 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 @@ expressions. It is similar to the tool lex or flex for C/C++. %prep %setup -q +%patch1 -p1 -b .orig %build @@ -56,6 +57,7 @@ rm -rf ${RPM_BUILD_ROOT} * Tue Nov 25 2008 Jens Petersen - 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 - 2.3-1 - Update to 2.3