diff --git a/chalmers-lava2000-1.1.2-ghc74-haskell98.patch b/chalmers-lava2000-1.1.2-ghc74-haskell98.patch index d6863c3..bc076c7 100644 --- a/chalmers-lava2000-1.1.2-ghc74-haskell98.patch +++ b/chalmers-lava2000-1.1.2-ghc74-haskell98.patch @@ -5,7 +5,7 @@ diff -up chalmers-lava2000-1.1.2/chalmers-lava2000.cabal~ chalmers-lava2000-1.1. other-modules: Paths_chalmers_lava2000 -- build-Depends: base >= 3 && < 5, haskell98 >= 1 && < 3, process >= 1 && < 2 +- build-Depends: base >= 3 && < 5, haskell98 >= 1 && < 2, process >= 1 && < 2 + build-Depends: base >= 3 && < 5, process >= 1 && < 2, random extensions: Rank2Types, ExistentialQuantification diff --git a/chalmers-lava2000-1.1.2-haskell98.patch b/chalmers-lava2000-1.1.2-haskell98.patch deleted file mode 100644 index 3e21356..0000000 --- a/chalmers-lava2000-1.1.2-haskell98.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u chalmers-lava2000-1.1.2/chalmers-lava2000.cabal\~ chalmers-lava2000-1.1.2/chalmers-lava2000.cabal ---- chalmers-lava2000-1.1.2/chalmers-lava2000.cabal~ 2012-03-24 17:38:40.758730551 +0900 -+++ chalmers-lava2000-1.1.2/chalmers-lava2000.cabal 2012-03-24 17:39:01.318650849 +0900 -@@ -44,7 +44,7 @@ - other-modules: - Paths_chalmers_lava2000 - -- build-Depends: base >= 3 && < 5, haskell98 >= 1 && < 2, process >= 1 && < 2 -+ build-Depends: base >= 3 && < 5, haskell98 >= 1 && < 3, process >= 1 && < 2 - - extensions: Rank2Types, ExistentialQuantification - ghc-options: -fno-warn-overlapping-patterns -fno-warn-missing-methods diff --git a/ghc-chalmers-lava2000.spec b/ghc-chalmers-lava2000.spec index 6702e63..a629967 100644 --- a/ghc-chalmers-lava2000.spec +++ b/ghc-chalmers-lava2000.spec @@ -23,10 +23,9 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec Source1: README.fedora -BuildRequires: ghc-haskell98-prof +BuildRequires: ghc-random-devel Patch0: ghc-chalmers-lava2000-remove-verification-modules.patch -Patch1: chalmers-lava2000-1.1.2-haskell98.patch -Patch2: chalmers-lava2000-1.1.2-ghc74-haskell98.patch +Patch1: chalmers-lava2000-1.1.2-ghc74-haskell98.patch %description %{common_description} @@ -36,7 +35,6 @@ Patch2: chalmers-lava2000-1.1.2-ghc74-haskell98.patch %setup -q -n %{pkg_name}-%{version} %patch0 -p1 -b .orig %patch1 -p1 -b .haskell98 -%patch2 -p1 -b .ghc74 %{__install} -pm 644 %{SOURCE1} . @@ -69,6 +67,7 @@ echo "%doc tutorial.ps.gz" >> %{name}-doc.files %changelog * Wed Apr 11 2012 Jens Petersen - 1.1.2-4 - fix up haskell98 build issues for ghc74 +- now depends no random instead of haskell98 * Sat Mar 24 2012 Jens Petersen - 1.1.2-3 - update to cabal2spec-0.25