diff --git a/haskell-platform-2014.2.0.0-version-bumps.patch b/haskell-platform-2014.2.0.0-version-bumps.patch index 469b078..74037b2 100644 --- a/haskell-platform-2014.2.0.0-version-bumps.patch +++ b/haskell-platform-2014.2.0.0-version-bumps.patch @@ -43,17 +43,3 @@ 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, -- alex ==3.1.3, -- happy ==1.19.4, -- hscolour ==1.20.3 -+-- cabal-install ==1.18.0.8, -+ alex ==3.1.4, -+ happy ==1.19.5, -+ hscolour ==1.20 - -Diff finished. Fri Apr 3 19:11:31 2015 diff --git a/haskell-platform.spec b/haskell-platform.spec index eed3067..6d85605 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -45,7 +45,7 @@ Version: %{upstream_version}.2 # - release can only be reset if all library versions get bumped simultaneously # (eg for a major release) # - minor release numbers should be incremented monotonically -Release: 2%{?dist} +Release: 3%{?dist} Summary: Standard Haskell distribution Group: Development/Tools @@ -184,6 +184,20 @@ This provides the haskell-platform meta library package. # hack for h-p.cabal in top dir 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 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 happy '==1.19.4' '1.19.5' +# HsColour reports 1.20 +cabal-tweak-dep-ver hscolour '==1.20.3' '1.20' +%endif mv %{name}.cabal packages/%{name}-%{version} @@ -249,6 +263,9 @@ rm %{buildroot}/%{_docdir}/ghc-%{name}*/LICENSE %changelog +* Fri Apr 10 2015 Jens Petersen - 2014.2.0.0.2-3 +- workaround build-tools version detection failures on aarch64 (#1210323) + * Fri Apr 3 2015 Jens Petersen - 2014.2.0.0.2-2 - bump alex to 3.1.4 - bump cabal-install to 1.18.0.8