rpms/haskell-platform/devel haskell-platform-2010.1.0.0-ghc-6.12.2.patch, NONE, 1.1 haskell-platform.spec, 1.5, 1.6

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/haskell-platform/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21969

Modified Files:
	haskell-platform.spec 
Added Files:
	haskell-platform-2010.1.0.0-ghc-6.12.2.patch 
Log Message:
break haskell-platform-2010.1.0.0 with ghc-6.12.2

haskell-platform-2010.1.0.0-ghc-6.12.2.patch:
 haskell-platform.cabal |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE haskell-platform-2010.1.0.0-ghc-6.12.2.patch ---
diff -u haskell-platform-2010.1.0.0/haskell-platform.cabal\~ haskell-platform-2010.1.0.0/haskell-platform.cabal
--- haskell-platform-2010.1.0.0/haskell-platform.cabal~	2010-03-22 19:15:10.000000000 +1000
+++ haskell-platform-2010.1.0.0/haskell-platform.cabal	2010-04-29 09:59:30.000000000 +1000
@@ -1,5 +1,5 @@
 name:                haskell-platform
-version:             2010.1.0.0
+version:             2010.1.0.0.6122
 homepage:            http://haskell.org/platform
 license:             BSD3
 license-file:        LICENSE

Diff finished.  Thu Apr 29 09:59:35 2010


Index: haskell-platform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haskell-platform/devel/haskell-platform.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- haskell-platform.spec	24 Mar 2010 08:42:32 -0000	1.5
+++ haskell-platform.spec	29 Apr 2010 00:08:33 -0000	1.6
@@ -7,11 +7,13 @@ distilled from Hackage.
 
 %bcond_without shared
 
+%global upstream_version 2010.1.0.0
+
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 %define platform_progs()\
-%{?1}Requires:       ghc = 6.12.1\
+%{?1}Requires:       ghc = 6.12.2\
 %{?1}Requires:       cabal-install = 0.8.0\
 %{?1}Requires:       alex = 2.3.2\
 %{?1}Requires:       happy = 1.18.4\
@@ -41,14 +43,14 @@ distilled from Hackage.
 %{nil}
 
 Name:           %{pkg_name}
-Version:        2010.1.0.0
+Version:        %{upstream_version}.6122
 Release:        1%{?dist}
 Summary:        Standard Haskell distribution
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://hackage.haskell.org/platform
-Source0:        http://hackage.haskell.org/platform/%{version}/cabal/%{name}-%{version}.tar.gz
+Source0:        http://hackage.haskell.org/platform/%{upstream_version}/cabal/%{name}-%{upstream_version}.tar.gz
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
 BuildRequires:  ghc, ghc-rpm-macros >= 0.5.1
@@ -58,6 +60,7 @@ BuildRequires:  ghc-prof
 %platform_libs devel Build
 %platform_progs
 Requires:       ghc-haskell-platform-devel = %{version}
+Patch1:         haskell-platform-2010.1.0.0-ghc-6.12.2.patch
 
 %description
 %{common_description}
@@ -114,7 +117,8 @@ This package contains profiling librarie
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{upstream_version}
+%patch1 -p1 -b .orig
 
 
 %build
@@ -174,6 +178,9 @@ fi
 
 
 %changelog
+* Thu Apr 29 2010 Jens Petersen <petersen at redhat.com> - 2010.1.0.0.6122-1
+- break haskell-platform-2010.1.0.0 with ghc-6.12.2
+
 * Wed Mar 24 2010 Jens Petersen <petersen at redhat.com> - 2010.1.0.0-1
 - update to 2010.1.0.0 beta release
 - update versions of alex, cgi, network, parallel, QuickCheck, HTTP