From 3918088c4e4776c18069ec967f740be723ced8d8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 2 Feb 2016 00:43:38 +0900 Subject: [PATCH] Reverting "update to 0.11.0.0" This reverts commit 5d6bb30599cdf9d70991474b49a0be728c27472d. --- .gitignore | 1 - ghc-vector.spec | 26 ++++++------------------- sources | 2 +- vector-debian-no_ann_without_ghci.patch | 24 +++++++++++++++++++++++ 4 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 vector-debian-no_ann_without_ghci.patch diff --git a/.gitignore b/.gitignore index 422416b..030839e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ /vector-0.10.0.1.tar.gz /vector-0.10.9.1.tar.gz /vector-0.10.12.3.tar.gz -/vector-0.11.0.0.tar.gz diff --git a/ghc-vector.spec b/ghc-vector.spec index 165023d..37fa2cf 100644 --- a/ghc-vector.spec +++ b/ghc-vector.spec @@ -2,31 +2,22 @@ %global pkg_name vector -%bcond_with tests - Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.11.0.0 +Version: 0.10.12.3 Release: 1%{?dist} Summary: Efficient Arrays License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Patch1: vector-debian-no_ann_without_ghci.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-deepseq-devel BuildRequires: ghc-primitive-devel -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-random-devel -BuildRequires: ghc-template-haskell-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-quickcheck2-devel -BuildRequires: ghc-transformers-devel -%endif # End cabal-rpm deps %description @@ -48,6 +39,10 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +# Monad.hs fails on ppc too +%ifnarch %(echo %{ghc_arches_with_ghci} | sed -e s/ppc//) +%patch1 -p1 -b .orig +%endif %build @@ -60,12 +55,6 @@ This package provides the Haskell %{pkg_name} library development files. rm %{buildroot}%{ghc_pkgdocdir}/LICENSE -%check -%if %{with tests} -%cabal test -%endif - - %post devel %ghc_pkg_recache @@ -83,9 +72,6 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %changelog -* Fri Oct 02 2015 Jens Petersen - 0.11.0.0-1 -- update to 0.11.0.0 - * Thu Sep 17 2015 Jens Petersen - 0.10.12.3-1 - update to 0.10.12.3 diff --git a/sources b/sources index c578d06..bc1ace6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a08605271abb3ed815135572a42b8524 vector-0.11.0.0.tar.gz +a9e325be278ca0f0e4d123a8c3f8ee79 vector-0.10.12.3.tar.gz diff --git a/vector-debian-no_ann_without_ghci.patch b/vector-debian-no_ann_without_ghci.patch new file mode 100644 index 0000000..21582db --- /dev/null +++ b/vector-debian-no_ann_without_ghci.patch @@ -0,0 +1,24 @@ + http://hackage.haskell.org/trac/ghc/ticket/4268 + +--- 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 ++#if 0 + import GHC.Exts ( SpecConstrAnnotation(..) ) + #endif ++#endif + + #include "vector.h" + + data SPEC = SPEC | SPEC2 + #if __GLASGOW_HASKELL__ >= 700 ++#if 0 + {-# ANN type SPEC ForceSpecConstr #-} + #endif ++#endif + + emptyStream :: String + {-# NOINLINE emptyStream #-}