diff --git a/.cvsignore b/.cvsignore index 1be4562..4a3c164 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -ghc-6.12.2-src.tar.bz2 -testsuite-6.12.2.tar.bz2 +ghc-6.12.3-src.tar.bz2 +testsuite-6.12.3.tar.bz2 diff --git a/ghc.spec b/ghc.spec index 8525500..72ae699 100644 --- a/ghc.spec +++ b/ghc.spec @@ -11,21 +11,21 @@ %bcond_without manual # run testsuite %bcond_without testsuite +# include colored html src +%bcond_without hscolour ## default disabled options ## # include extralibs %bcond_with extralibs # quick build profile %bcond_with quick -# include colored html src -%bcond_with hscolour # the debuginfo subpackage is currently empty anyway, so don't generate it %global debug_package %{nil} Name: ghc # break of haskell-platform-2010.1.0.0 -Version: 6.12.2.20100521 +Version: 6.12.3 Release: 1%{?dist} Summary: Glasgow Haskell Compilation system # fedora ghc has only been bootstrapped on the following archs: @@ -43,7 +43,7 @@ URL: http://haskell.org/ghc/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # introduced for f11 Obsoletes: haddock < 2.4.2-3, ghc-haddock-devel < 2.4.2-3 -BuildRequires: ghc, happy, ghc-rpm-macros >= 0.5.6 +BuildRequires: ghc, happy, ghc-rpm-macros >= 0.5.8 BuildRequires: gmp-devel, ncurses-devel Requires: gcc, gmp-devel %if %{with shared} @@ -187,6 +187,9 @@ for i in hsc2hs runhaskell; do fi done +%ghc_strip_shared + + %check # stolen from ghc6/debian/rules: # Do some very simple tests that the compiler actually works @@ -284,6 +287,11 @@ fi %endif %changelog +* Mon Jun 14 2010 Jens Petersen - 6.12.3-1 +- 6.12.3 +- build with hscolour +- use ghc-rpm-macro-0.5.8 for ghc_strip_shared macro + * Fri May 28 2010 Jens Petersen - 6.12.2.20100521-1 - 6.12.3 rc1 - ghost package.cache diff --git a/sources b/sources index 15fa29c..e7c5106 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b7ab3d3c2d58534cb3f31a00e2c12c67 ghc-6.12.2-src.tar.bz2 -07e7bdf0f0742889cebf47e5b977bf6c testsuite-6.12.2.tar.bz2 +4c2663c2eff833d7b9f39ef770eefbd6 ghc-6.12.3-src.tar.bz2 +5c6143040d043f10e6d014cd5fd8ca36 testsuite-6.12.3.tar.bz2