From e32ed2e5a2da792becb8e59c456645796fb99fed Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Jun 2014 18:35:20 +0900 Subject: [PATCH] tweak build-tools - need custom Setup for cabal-install - HsColour-1.20.x reports version 1.20 --- haskell-platform-2014.1.0.0-buildtools.patch | 12 ++++++++++++ haskell-platform.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 haskell-platform-2014.1.0.0-buildtools.patch diff --git a/haskell-platform-2014.1.0.0-buildtools.patch b/haskell-platform-2014.1.0.0-buildtools.patch new file mode 100644 index 0000000..4db0b08 --- /dev/null +++ b/haskell-platform-2014.1.0.0-buildtools.patch @@ -0,0 +1,12 @@ +--- haskell-platform-2014.1.0.0/haskell-platform.cabal~ 2014-06-04 18:21:10.000000000 +0900 ++++ haskell-platform-2014.1.0.0/haskell-platform.cabal 2014-06-06 18:32:55.707251149 +0900 +@@ -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.4, ++-- cabal-install ==1.18.0.4, + alex ==3.1.3, + happy ==1.19.3, +- hscolour ==1.20.3 ++ hscolour ==1.20 diff --git a/haskell-platform.spec b/haskell-platform.spec index 9b3bc2d..d55c856 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -49,6 +49,7 @@ License: BSD URL: http://hackage.haskell.org/platform Source0: http://lambda.haskell.org/platform/download/%{version}/%{name}-%{version}.tar.gz Source1: LICENSE +Patch1: haskell-platform-2014.1.0.0-buildtools.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra @@ -169,12 +170,14 @@ This provides the haskell-platform meta library package. %prep %setup -q -n %{name}-%{version} +%patch1 -p1 -b .orig # hack for h-p.cabal in top dir mkdir packages/%{name}-%{version} cp %SOURCE1 hptool/Setup.hs packages/%{name}-%{version} mv %{name}.cabal packages/%{name}-%{version} + %build HOME=$PWD %define cabal_configure_options --user