[ghc-chalmers-lava2000] bump base to 4 for ghc 7

Jens Petersen petersen at fedoraproject.org
Mon Nov 29 00:52:05 UTC 2010


commit d8218b5e4b1063b26d7d61d06391fcab1fd3a3ef
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Nov 29 10:52:11 2010 +1000

    bump base to 4 for ghc 7

 chalmers-lava2000-1.1.1-ghc7.patch |   12 ++++++++++++
 ghc-chalmers-lava2000.spec         |    3 +++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/chalmers-lava2000-1.1.1-ghc7.patch b/chalmers-lava2000-1.1.1-ghc7.patch
new file mode 100644
index 0000000..c083849
--- /dev/null
+++ b/chalmers-lava2000-1.1.1-ghc7.patch
@@ -0,0 +1,12 @@
+diff -u chalmers-lava2000-1.1.1/chalmers-lava2000.cabal\~ chalmers-lava2000-1.1.1/chalmers-lava2000.cabal
+--- chalmers-lava2000-1.1.1/chalmers-lava2000.cabal~	2010-11-29 10:46:59.000000000 +1000
++++ chalmers-lava2000-1.1.1/chalmers-lava2000.cabal	2010-11-29 10:47:46.000000000 +1000
+@@ -45,7 +45,7 @@
+     other-modules:
+                      Paths_chalmers_lava2000
+ 
+-    build-Depends:   base >= 3 && < 4, haskell98 >= 1 && < 2, process >= 1 && < 2
++    build-Depends:   base >= 3 && < 5, haskell98 >= 1 && < 2, 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 ab176e2..a10b31c 100644
--- a/ghc-chalmers-lava2000.spec
+++ b/ghc-chalmers-lava2000.spec
@@ -31,6 +31,7 @@ BuildRequires:  ghc-rpm-macros >= 0.8.1
 %if %{with hscolour}
 BuildRequires:  hscolour
 %endif
+Patch1:         chalmers-lava2000-1.1.1-ghc7.patch
 
 %description
 %{common_description}
@@ -43,6 +44,7 @@ This package provides the shared library.
 %setup -q -n %{pkg_name}-%{version}
 %patch0 -p1 -b .orig
 %{__install} -pm 644 %{SOURCE1} .
+%patch1 -p1 -b .base3
 
 
 %build
@@ -70,6 +72,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Mon Nov 29 2010 Jens Petersen <petersen at redhat.com> - 1.1.1-7
+- bump base to 4 for ghc 7
 - update url and drop -o obsoletes
 
 * Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 1.1.1-7


More information about the scm-commits mailing list