rpms/haskell-platform/devel haskell-platform-2010.1.0.0-ghc-6.12.2.patch, 1.1, 1.2 haskell-platform.spec, 1.6, 1.7

[Jens Petersen]

Author: petersen

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

Modified Files:
	haskell-platform-2010.1.0.0-ghc-6.12.2.patch 
	haskell-platform.spec 
Log Message:
- bump ghc to 6.12.3
- sync cabal2spec-0.22.1



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

Index: haskell-platform-2010.1.0.0-ghc-6.12.2.patch
===================================================================
RCS file: /cvs/extras/rpms/haskell-platform/devel/haskell-platform-2010.1.0.0-ghc-6.12.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- haskell-platform-2010.1.0.0-ghc-6.12.2.patch	29 Apr 2010 00:08:33 -0000	1.1
+++ haskell-platform-2010.1.0.0-ghc-6.12.2.patch	27 Jun 2010 08:25:36 -0000	1.2
@@ -4,7 +4,7 @@ diff -u haskell-platform-2010.1.0.0/hask
 @@ -1,5 +1,5 @@
  name:                haskell-platform
 -version:             2010.1.0.0
-+version:             2010.1.0.0.6122
++version:             2010.1.0.0.6123
  homepage:            http://haskell.org/platform
  license:             BSD3
  license-file:        LICENSE


Index: haskell-platform.spec
===================================================================
RCS file: /cvs/extras/rpms/haskell-platform/devel/haskell-platform.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- haskell-platform.spec	29 Apr 2010 00:08:33 -0000	1.6
+++ haskell-platform.spec	27 Jun 2010 08:25:36 -0000	1.7
@@ -13,7 +13,7 @@ distilled from Hackage.
 %global debug_package %{nil}
 
 %define platform_progs()\
-%{?1}Requires:       ghc = 6.12.2\
+%{?1}Requires:       ghc = 6.12.3\
 %{?1}Requires:       cabal-install = 0.8.0\
 %{?1}Requires:       alex = 2.3.2\
 %{?1}Requires:       happy = 1.18.4\
@@ -43,7 +43,7 @@ distilled from Hackage.
 %{nil}
 
 Name:           %{pkg_name}
-Version:        %{upstream_version}.6122
+Version:        %{upstream_version}.6123
 Release:        1%{?dist}
 Summary:        Standard Haskell distribution
 
@@ -51,11 +51,11 @@ Group:          Development/Tools
 License:        BSD
 URL:            http://hackage.haskell.org/platform
 Source0:        http://hackage.haskell.org/platform/%{upstream_version}/cabal/%{name}-%{upstream_version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros >= 0.5.1
-BuildRequires:  ghc-doc
-BuildRequires:  ghc-prof
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.7.0
 %platform_progs Build
 %platform_libs devel Build
 %platform_progs
@@ -122,16 +122,12 @@ This package contains profiling librarie
 
 
 %build
-%cabal_configure --ghc %{?with_prof:-p}
-%cabal build
-%cabal haddock
+%ghc_lib_build
 
 
 %install
-%cabal_install
-%cabal_pkg_conf
-
-%ghc_gen_filelists
+rm -rf $RPM_BUILD_ROOT
+%ghc_lib_install
 
 
 %clean
@@ -178,6 +174,10 @@ fi
 
 
 %changelog
+* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 2010.1.0.0.6123-1
+- bump ghc to 6.12.3
+- sync cabal2spec-0.22.1
+
 * 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