[haskell-platform] bump some versions for ghc-7.0.1
Jens Petersen
petersen at fedoraproject.org
Fri Nov 26 09:25:21 UTC 2010
commit 3c3a8ae2629273b3584c7bb516fd00fe890ce09b
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Nov 26 19:25:24 2010 +1000
bump some versions for ghc-7.0.1
haskell-platform-2010.2.0.0-ghc-7.0.patch | 53 +++++++++++++++++++++++++++++
haskell-platform.spec | 23 ++++++++-----
2 files changed, 67 insertions(+), 9 deletions(-)
---
diff --git a/haskell-platform-2010.2.0.0-ghc-7.0.patch b/haskell-platform-2010.2.0.0-ghc-7.0.patch
new file mode 100644
index 0000000..53a936e
--- /dev/null
+++ b/haskell-platform-2010.2.0.0-ghc-7.0.patch
@@ -0,0 +1,53 @@
+diff -u haskell-platform-2010.2.0.0/haskell-platform.cabal\~ haskell-platform-2010.2.0.0/haskell-platform.cabal
+--- haskell-platform-2010.2.0.0/haskell-platform.cabal~ 2010-07-22 10:03:59.000000000 +1000
++++ haskell-platform-2010.2.0.0/haskell-platform.cabal 2010-11-26 16:57:30.000000000 +1000
+@@ -1,5 +1,5 @@
+ name: haskell-platform
+-version: 2010.2.0.0
++version: 2010.2.0.0.701
+ homepage: http://haskell.org/platform
+ license: BSD3
+ license-file: LICENSE
+@@ -53,34 +53,34 @@
+ -- Win32 ==2.2.0.1 -- removed??
+
+ -- Libraries in addition to what GHC provides:
+- cgi ==3001.1.7.3,
++ cgi ==3001.1.7.4,
+ fgl ==5.4.2.3,
+ GLUT ==2.1.2.1,
+ -- NOTE
+- haskell-src ==1.0.1.3,
++ haskell-src ==1.0.1.4,
+ html ==1.0.1.2,
+ HUnit ==1.2.2.1,
+- mtl ==1.1.0.2,
++ mtl ==2.0.1.0,
+ network ==2.2.1.7,
+ OpenGL ==2.2.3.0,
+ -- NOTE
+- parallel ==2.2.0.1,
++ parallel ==3.1.0.1,
+ parsec ==2.1.0.1,
+ -- NOTE, not using parsec 3
+- QuickCheck ==2.1.1.1,
++ QuickCheck ==2.4.0.1,
+ regex-base ==0.93.2,
+ regex-compat ==0.93.1,
+ regex-posix ==0.94.2,
+ stm ==2.1.2.1,
+ xhtml ==3000.2.0.1,
+ zlib ==0.5.2.0,
+- HTTP ==4000.0.9,
+- deepseq ==1.1.0.0
++ HTTP ==4000.1.0,
++ deepseq ==1.1.0.2
+
+ -- Depending on programs does not work, they are not registered
+ -- We list them to help distro packaging.
+ build-tools:
+- cabal-install ==0.8.2,
++ cabal-install ==0.9.5,
+ alex ==2.3.3,
+ happy ==1.18.5
+ -- haddock ==2.7.2 -- valid, but needs ghc-paths
diff --git a/haskell-platform.spec b/haskell-platform.spec
index ad70a5d..018d603 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -14,37 +14,37 @@ distilled from Hackage.
%define platform_progs()\
-%{?1}Requires: ghc = 6.12.3\
-%{?1}Requires: cabal-install = 0.8.2\
+%{?1}Requires: ghc = 7.0.1\
+%{?1}Requires: cabal-install = 0.9.5\
%{?1}Requires: alex = 2.3.3\
%{?1}Requires: happy = 1.18.5\
%{nil}
%define platform_libs()\
-%{?2}Requires: ghc-cgi%{?1:-%1} = 3001.1.7.3\
+%{?2}Requires: ghc-cgi%{?1:-%1} = 3001.1.7.4\
%{?2}Requires: ghc-fgl%{?1:-%1} = 5.4.2.3\
%{?2}Requires: ghc-GLUT%{?1:-%1} = 2.1.2.1\
-%{?2}Requires: ghc-haskell-src%{?1:-%1} = 1.0.1.3\
+%{?2}Requires: ghc-haskell-src%{?1:-%1} = 1.0.1.4\
%{?2}Requires: ghc-html%{?1:-%1} = 1.0.1.2\
%{?2}Requires: ghc-HUnit%{?1:-%1} = 1.2.2.1\
%{?2}Requires: ghc-mtl%{?1:-%1} = 1.1.0.2\
%{?2}Requires: ghc-network%{?1:-%1} = 2.2.1.7\
%{?2}Requires: ghc-OpenGL%{?1:-%1} = 2.2.3.0\
+%{?2}Requires: ghc-parallel%{?1:-%1} = 3.1.0.1\
%{?2}Requires: ghc-parsec%{?1:-%1} = 2.1.0.1\
-%{?2}Requires: ghc-parallel%{?1:-%1} = 2.2.0.1\
-%{?2}Requires: ghc-QuickCheck%{?1:-%1} = 2.1.1.1\
+%{?2}Requires: ghc-QuickCheck%{?1:-%1} = 2.4.0.1\
%{?2}Requires: ghc-regex-base%{?1:-%1} = 0.93.2\
%{?2}Requires: ghc-regex-compat%{?1:-%1} = 0.93.1\
%{?2}Requires: ghc-regex-posix%{?1:-%1} = 0.94.2\
%{?2}Requires: ghc-stm%{?1:-%1} = 2.1.2.1\
%{?2}Requires: ghc-xhtml%{?1:-%1} = 3000.2.0.1\
%{?2}Requires: ghc-zlib%{?1:-%1} = 0.5.2.0\
-%{?2}Requires: ghc-HTTP%{?1:-%1} = 4000.0.9\
-%{?2}Requires: ghc-deepseq%{?1:-%1} = 1.1.0.0\
+%{?2}Requires: ghc-HTTP%{?1:-%1} = 4000.1.0\
+%{?2}Requires: ghc-deepseq%{?1:-%1} = 1.1.0.2\
%{nil}
Name: %{pkg_name}
-Version: %{upstream_version}
+Version: %{upstream_version}.701
Release: 1%{?dist}
Summary: Standard Haskell distribution
@@ -61,6 +61,7 @@ BuildRequires: ghc-rpm-macros >= 0.8.1
%platform_libs devel Build
%platform_progs
Requires: ghc-haskell-platform-devel = %{version}
+Patch1: haskell-platform-2010.2.0.0-ghc-7.0.patch
%description
%{common_description}
@@ -106,6 +107,7 @@ This package contains profiling libraries.
%prep
%setup -q -n %{name}-%{upstream_version}
+%patch1 -p1 -b .orig
%build
@@ -155,6 +157,9 @@ fi
%changelog
+* Fri Nov 26 2010 Jens Petersen <petersen at redhat.com> - 2010.2.0.0.701-1
+- bump some versions for ghc-7.0.1
+
* Fri Jul 23 2010 Jens Petersen <petersen at redhat.com> - 2010.2.0.0-1
- update to 2010.2.0.0 final release (no actual changes)
More information about the scm-commits
mailing list