diff --git a/.gitignore b/.gitignore index 4a3c164..435f172 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ ghc-6.12.3-src.tar.bz2 testsuite-6.12.3.tar.bz2 +/ghc-7.0.1-src.tar.bz2 +/testsuite-7.0.1.tar.bz2 diff --git a/ghc.spec b/ghc.spec index f6121e8..505ecbf 100644 --- a/ghc.spec +++ b/ghc.spec @@ -13,22 +13,22 @@ %bcond_without testsuite # include colored html src %bcond_without hscolour +# use system libffi +%bcond_without libffi ## default disabled options ## # include extralibs %bcond_with extralibs # quick build profile %bcond_with quick -# use system libffi -%bcond_with libffi # the debuginfo subpackage is currently empty anyway, so don't generate it %global debug_package %{nil} Name: ghc -# part of haskell-platform-2010.2.0.0 -Version: 6.12.3 -Release: 9%{?dist} +# breaks haskell-platform-2010.2.0.0 +Version: 7.0.1 +Release: 1%{?dist} Summary: Glasgow Haskell Compilation system # fedora ghc has only been bootstrapped on the following archs: ExclusiveArch: %{ix86} x86_64 ppc alpha @@ -57,6 +57,7 @@ BuildRequires: ghc, ghc-rpm-macros >= 0.8.2 BuildRequires: gmp-devel, ncurses-devel BuildRequires: libffi-devel Requires: gcc, gmp-devel +# llvm is an optional dependency %if %{with shared} Requires: %{name}-libs = %{version}-%{release} %endif @@ -280,12 +281,11 @@ fi %{ghcdocbasedir}/libraries/frames.html %{ghcdocbasedir}/libraries/gen_contents_index %{ghcdocbasedir}/libraries/hscolour.css +%{ghcdocbasedir}/libraries/ocean.css %{ghcdocbasedir}/libraries/prologue.txt %{ghcdocbasedir}/index.html %ghost %{ghcdocbasedir}/libraries/doc-index*.html -%ghost %{ghcdocbasedir}/libraries/haddock.css %ghost %{ghcdocbasedir}/libraries/haddock-util.js -%ghost %{ghcdocbasedir}/libraries/haskell_icon.gif %ghost %{ghcdocbasedir}/libraries/index*.html %ghost %{ghcdocbasedir}/libraries/minus.gif %ghost %{ghcdocbasedir}/libraries/plus.gif @@ -303,6 +303,10 @@ fi %endif %changelog +* Tue Nov 16 2010 Jens Petersen - 7.0.1-1 +- update to 7.0.1 release +- turn on system libffi again + * Mon Nov 8 2010 Jens Petersen - 6.12.3-9 - disable the libffi changes for now since they break libHSffi*.so diff --git a/sources b/sources index e7c5106..b3abffd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4c2663c2eff833d7b9f39ef770eefbd6 ghc-6.12.3-src.tar.bz2 -5c6143040d043f10e6d014cd5fd8ca36 testsuite-6.12.3.tar.bz2 +91814d1de48c661fd79ffa810026ed19 ghc-7.0.1-src.tar.bz2 +96ea44f9c0fe6552883e2aa129f3e701 testsuite-7.0.1.tar.bz2