petersen pushed to haskell-platform (master). "comment out cabal-install again in haskell-platform.cabal"

[notifications at fedoraproject.org]

>From 86a7d3fe360755c1c73c152ef013dbeb90b2a3c1 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen at redhat.com>
Date: Fri, 17 Apr 2015 17:39:00 +0900
Subject: comment out cabal-install again in haskell-platform.cabal


diff --git a/haskell-platform-2014.2.0.0-version-bumps.patch b/haskell-platform-2014.2.0.0-version-bumps.patch
index 74037b2..b0031ae 100644
--- a/haskell-platform-2014.2.0.0-version-bumps.patch
+++ b/haskell-platform-2014.2.0.0-version-bumps.patch
@@ -43,3 +43,12 @@
        unordered-containers           ==0.2.4.0,
        vector                         ==0.10.9.1,
        xhtml                          ==3000.2.1,
+@@ -103,7 +103,7 @@
+   -- Depending on programs does not work, they are not registered
+   -- We list them to help distro packaging.
+   build-tools:
+-      cabal-install                  ==1.18.0.5,
++--      cabal-install                  ==1.18.0.5,
+       alex                           ==3.1.3,
+       happy                          ==1.19.4,
+       hscolour                       ==1.20.3
diff --git a/haskell-platform.spec b/haskell-platform.spec
index 013ec8e..fda78d3 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -185,15 +185,16 @@ This provides the haskell-platform meta library package.
 mkdir packages/%{name}-%{version}
 cp LICENSE hptool/Setup.hs packages/%{name}-%{version}
 
-cabal-tweak-dep-ver cabal-install '==1.18.0.5' ''
 
 %ifarch aarch64
 # bz#1210323
 cabal-tweak-dep-ver alex '==3.1.3' ''
+cabal-tweak-dep-ver cabal-install '==1.18.0.5' ''
 cabal-tweak-dep-ver happy '==1.19.4' ''
 cabal-tweak-dep-ver hscolour '==1.20.3' ''
 %else
 cabal-tweak-dep-ver alex '==3.1.3' '==3.1.4'
+cabal-tweak-dep-ver cabal-install '==1.18.0.5' '==1.18.0.8'
 cabal-tweak-dep-ver happy '==1.19.4' '==1.19.5'
 # HsColour reports 1.20
 cabal-tweak-dep-ver hscolour '==1.20.3' '==1.20'
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/haskell-platform.git/commit/?h=master&id=86a7d3fe360755c1c73c152ef013dbeb90b2a3c1