[ghc-vector/f16] correct the annotation patch to not use DEBIAN_NO_GHCI
Jens Petersen
petersen at fedoraproject.org
Thu Dec 6 06:34:31 UTC 2012
commit 8abea566cc3d64c455e7bbf211c391e4ef339641
Author: Jens Petersen <petersen at redhat.com>
Date: Thu Dec 6 15:34:23 2012 +0900
correct the annotation patch to not use DEBIAN_NO_GHCI
and also changelog version
ghc-vector.spec | 7 +++++--
vector-debian-no_ann_without_ghci.patch | 11 ++---------
2 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/ghc-vector.spec b/ghc-vector.spec
index c6ea282..04125d0 100644
--- a/ghc-vector.spec
+++ b/ghc-vector.spec
@@ -10,7 +10,7 @@ immutable), with a powerful loop fusion optimization framework.
Name: ghc-%{pkg_name}
Version: 0.7.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: %{common_summary}
License: BSD
@@ -56,7 +56,10 @@ BuildRequires: ghc-primitive-devel
%changelog
-* Thu Dec 6 2012 Jens Petersen <petersen at redhat.com> - 0.9.1-6
+* Thu Dec 6 2012 Jens Petersen <petersen at redhat.com> - 0.7.1-4
+- correct the annotation patch to not use DEBIAN_NO_GHCI
+
+* Thu Dec 6 2012 Jens Petersen <petersen at redhat.com> - 0.7.1-3
- skip Data.Vector.Fusion.Stream.Monadic annotation on archs without ghci
- update with cabal-rpm
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 <nomeata at debian.org>
-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
More information about the scm-commits
mailing list