diff --git a/.gitignore b/.gitignore index 51972c7..9a00db0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ haskell-platform-2010.2.0.0.tar.gz /haskell-platform-2011.1.0.0.tar.gz /haskell-platform-2011.2.0.0.tar.gz +/haskell-platform-2011.2.0.1.tar.gz diff --git a/haskell-platform.spec b/haskell-platform.spec index 770e014..b301c78 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -7,16 +7,18 @@ distilled from Hackage. %define without_haddock 1 -%global upstream_version 2011.2.0.0 +%global upstream_version 2011.2.0.1 %define platform_progs()\ -%{?1}Requires: ghc = 7.0.2\ +%{?1}Requires: ghc = 7.0.3\ %{?1}Requires: cabal-install = 0.10.2\ %{?1}Requires: alex = 2.3.5\ %{?1}Requires: happy = 1.18.6\ %{nil} +# order here follows http://hackage.haskell.org/platform/changelog.html %define platform_libs()\ +%{?2}Requires: ghc%{?1:-%1} = 7.0.3\ %{?2}Requires: ghc-cgi%{?1:-%1} = 3001.1.7.4\ %{?2}Requires: ghc-fgl%{?1:-%1} = 5.4.2.3\ %{?2}Requires: ghc-GLUT%{?1:-%1} = 2.1.2.1\ @@ -37,23 +39,24 @@ distilled from Hackage. %{?2}Requires: ghc-xhtml%{?1:-%1} = 3000.2.0.1\ %{?2}Requires: ghc-zlib%{?1:-%1} = 0.5.3.1\ %{?2}Requires: ghc-HTTP%{?1:-%1} = 4000.1.1\ -%{?2}Requires: ghc-text%{?1:-%1} = 0.11.0.5\ +%{?2}Requires: ghc-deepseq%{?1:-%1} = 1.1.0.2\ +%{?2}Requires: ghc-text%{?1:-%1} = 0.11.0.6\ %{?2}Requires: ghc-transformers%{?1:-%1} = 0.2.2.0\ %{nil} Name: %{pkg_name} Version: %{upstream_version} -Release: 5%{?dist} +Release: 1%{?dist} Summary: Standard Haskell distribution Group: Development/Tools License: BSD URL: http://hackage.haskell.org/platform Source0: http://hackage.haskell.org/platform/%{upstream_version}/cabal/%{name}-%{upstream_version}.tar.gz -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 -BuildRequires: ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.3 +# no QuickCheck on ppc64 +ExcludeArch: %{ghc_excluded_archs} ppc64 +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros BuildRequires: hscolour %platform_progs Build %platform_libs devel Build @@ -130,6 +133,11 @@ rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE %changelog +* Mon Jun 20 2011 Jens Petersen - 2011.2.0.1-1 +- update to 2011.2.0.1: ghc-7.0.3 and text-0.11.0.6 +- use ghc_excluded_archs +- exclude ppc64: no QuickCheck + * Fri May 27 2011 Jens Petersen - 2011.2.0.0-5 - drop the prof subpackage diff --git a/sources b/sources index aa1462e..29a72f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18cbaa4092e79bef82e29ef63a1ca0e8 haskell-platform-2011.2.0.0.tar.gz +97fd42f169a426d043368cec342745ef haskell-platform-2011.2.0.1.tar.gz