diff --git a/ghc-vector.spec b/ghc-vector.spec index 05a13fe..d8de6b8 100644 --- a/ghc-vector.spec +++ b/ghc-vector.spec @@ -11,7 +11,7 @@ immutable), with a powerful loop fusion optimization framework. Name: ghc-%{pkg_name} # part of haskell-platform-2012.4 Version: 0.10.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} License: BSD @@ -57,6 +57,9 @@ BuildRequires: ghc-primitive-devel %changelog +* Thu Dec 6 2012 Jens Petersen - 0.10.0.1-3 +- correct the annotation patch to not use DEBIAN_NO_GHCI + * Thu Dec 6 2012 Jens Petersen - 0.10.0.1-2 - skip Data.Vector.Fusion.Stream.Monadic annotation on archs without ghci and build on all archs diff --git a/vector-debian-no_ann_without_ghci.patch b/vector-debian-no_ann_without_ghci.patch index 967f336..21582db 100644 --- a/vector-debian-no_ann_without_ghci.patch +++ b/vector-debian-no_ann_without_ghci.patch @@ -1,19 +1,12 @@ -Description: Disable annotation without ghci - Can be removed if ghc ignores annotation without an interpreter: http://hackage.haskell.org/trac/ghc/ticket/4268 -Author: Joachim Breitner -Bug-Debian: http://bugs.debian.org/640088 -Forwarded: no -Index: haskell-vector-0.9.1/Data/Vector/Fusion/Stream/Monadic.hs -=================================================================== --- haskell-vector-0.9.1.orig/Data/Vector/Fusion/Stream/Monadic.hs 2012-02-10 23:48:51.000000000 +0100 +++ haskell-vector-0.9.1/Data/Vector/Fusion/Stream/Monadic.hs 2012-02-10 23:49:04.000000000 +0100 @@ -94,15 +94,19 @@ import Data.Word ( Word8, Word16, Word32, Word, Word64 ) #if __GLASGOW_HASKELL__ >= 700 -+#ifndef DEBIAN_NO_GHCI ++#if 0 import GHC.Exts ( SpecConstrAnnotation(..) ) #endif +#endif @@ -22,7 +15,7 @@ Index: haskell-vector-0.9.1/Data/Vector/Fusion/Stream/Monadic.hs data SPEC = SPEC | SPEC2 #if __GLASGOW_HASKELL__ >= 700 -+#ifndef DEBIAN_NO_GHCI ++#if 0 {-# ANN type SPEC ForceSpecConstr #-} #endif +#endif