[ghc-chalmers-lava2000] now depends on random instead of haskell98 - drop previous haskell98 patch
Jens Petersen
petersen at fedoraproject.org
Wed Apr 11 10:14:14 UTC 2012
commit f7de5ff8153b4ad6861c7a832d247c06659cfdc7
Author: Jens Petersen <petersen at redhat.com>
Date: Wed Apr 11 19:14:06 2012 +0900
now depends on random instead of haskell98 - drop previous haskell98 patch
chalmers-lava2000-1.1.2-ghc74-haskell98.patch | 2 +-
chalmers-lava2000-1.1.2-haskell98.patch | 12 ------------
ghc-chalmers-lava2000.spec | 7 +++----
3 files changed, 4 insertions(+), 17 deletions(-)
---
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/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 <petersen at redhat.com> - 1.1.2-4
- fix up haskell98 build issues for ghc74
+- now depends no random instead of haskell98
* Sat Mar 24 2012 Jens Petersen <petersen at redhat.com> - 1.1.2-3
- update to cabal2spec-0.25
More information about the scm-commits
mailing list