diff --git a/haskell-platform-build-tools-cabal-install.patch b/haskell-platform-build-tools-cabal-install.patch new file mode 100644 index 0000000..0b61caa --- /dev/null +++ b/haskell-platform-build-tools-cabal-install.patch @@ -0,0 +1,11 @@ +--- haskell-platform-7.10.2-a/haskell-platform.cabal~ 2015-08-06 00:06:13.000000000 +0900 ++++ haskell-platform-7.10.2-a/haskell-platform.cabal 2015-10-02 18:40:24.046614029 +0900 +@@ -110,7 +110,7 @@ + -- Depending on programs does not work, they are not registered + -- We list them to help distro packaging. + build-tools: +- cabal-install ==1.22.6.0, ++-- cabal-install ==1.22.6.0, + alex ==3.1.4, + happy ==1.19.5, + hscolour ==1.23, diff --git a/haskell-platform-build-tools.patch b/haskell-platform-build-tools.patch deleted file mode 100644 index b693433..0000000 --- a/haskell-platform-build-tools.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- haskell-platform-7.10.2-a/packages/haskell-platform-7.10.2/haskell-platform.cabal~ 2015-08-06 00:06:13.000000000 +0900 -+++ haskell-platform-7.10.2-a/packages/haskell-platform-7.10.2/haskell-platform.cabal 2015-10-02 18:40:24.046614029 +0900 -@@ -110,8 +110,8 @@ - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: -- cabal-install ==1.22.6.0, -+-- cabal-install ==1.22.6.0, - alex ==3.1.4, - happy ==1.19.5, -- hscolour ==1.23, -+ hscolour ==1.20, - haddock ==2.16.1 diff --git a/haskell-platform.spec b/haskell-platform.spec index 3026209..3de9503 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -56,7 +56,7 @@ Group: Development/Tools License: BSD URL: http://www.haskell.org/platform/ Source0: http://www.haskell.org/platform/download/%{version}/%{name}-%{upstream_version}-a.tar.gz -Patch1: haskell-platform-build-tools.patch +Patch1: haskell-platform-build-tools-cabal-install.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra @@ -190,19 +190,16 @@ This provides the haskell-platform meta library package. %prep %setup -q -n %{name}-%{upstream_version}-a +%patch1 -p1 -b .orig # hack for h-p.cabal in top dir mkdir packages/%{name}-%{version} cp LICENSE hptool/Setup.hs packages/%{name}-%{version} -#cabal-tweak-dep-ver alex '==3.1.3' '==3.1.4' -#cabal-tweak-dep-ver cabal-install '==1.18.0.5' '==%{cabal_install_version}' -#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' +cabal-tweak-dep-ver hscolour '==1.23' '==1.20' mv %{name}.cabal packages/%{name}-%{version} -%patch1 -p1 -b .orig %build