[haskell-platform] require ghc-compiler instead of ghc to avoid the ghc lib

Jens Petersen petersen at fedoraproject.org
Wed Mar 21 15:19:59 UTC 2012


commit 38d563f3be15835ea6a2df0276047c737b39706b
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Mar 22 00:19:54 2012 +0900

    require ghc-compiler instead of ghc to avoid the ghc lib
    
    - update .chain-deps

 .chain-deps           |    2 +-
 haskell-platform.spec |   10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.chain-deps b/.chain-deps
index 4e0a41f..90a0a93 100644
--- a/.chain-deps
+++ b/.chain-deps
@@ -1 +1 @@
-ghc-transformers alex ghc-deepseq ghc-html ghc-HUnit ghc-OpenGL ghc-stm ghc-syb ghc-xhtml : ghc-mtl ghc-GLUT ghc-parallel ghc-text : ghc-fgl ghc-parsec ghc-QuickCheck ghc-regex-base happy : ghc-haskell-src ghc-network ghc-regex-posix : ghc-regex-compat ghc-cgi ghc-HTTP ghc-zlib : cabal-install :
+ghc-transformers alex ghc-html ghc-HUnit ghc-OpenGL ghc-random ghc-stm ghc-syb ghc-xhtml ghc-zlib : ghc-mtl ghc-GLUT ghc-parallel ghc-text : ghc-fgl ghc-parsec ghc-QuickCheck ghc-regex-base happy : ghc-haskell-src ghc-network ghc-regex-posix : ghc-regex-compat ghc-cgi ghc-HTTP : cabal-install :
diff --git a/haskell-platform.spec b/haskell-platform.spec
index 85472b9..6ba3802 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -12,8 +12,9 @@ and tools.  It provides a good starting environment for Haskell development.
 %define without_haddock 1
 %define ghc_without_shared 1
 
+# ghci (ghc library) is not officially part of hackage-platform
 %define platform_progs()\
-%{?1}Requires:       ghc = 7.0.4\
+%{?1}Requires:       ghc-compiler = 7.0.4\
 %{?1}Requires:       cabal-install = 0.10.2\
 %{?1}Requires:       alex = 2.3.5\
 %{?1}Requires:       happy = 1.18.6\
@@ -49,7 +50,7 @@ and tools.  It provides a good starting environment for Haskell development.
 
 Name:           %{pkg_name}
 Version:        2011.4.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Standard Haskell distribution
 
 Group:          Development/Tools
@@ -105,10 +106,13 @@ Obsoletes:      ghc-%{name} < %{version}-%{release}
 %doc %{top_prefix}/LICENSE
 
 
-%ghc_files
+%ghc_files %{top_prefix}/LICENSE
 
 
 %changelog
+* Wed Mar 21 2012 Jens Petersen <petersen at redhat.com> - 2011.4.0.0-7
+- require ghc-compiler instead of ghc to avoid the ghc lib
+
 * Fri Jan 20 2012 Jens Petersen <petersen at redhat.com> - 2011.4.0.0-6
 - update to cabal2spec-0.25.2
 


More information about the scm-commits mailing list