From f30af757de1ac070578d0eab12de8704004c63d1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mar 24 2012 14:44:16 +0000 Subject: temporary metapackage updated to ghc-7.4.1 and latest libraries --- diff --git a/haskell-platform.spec b/haskell-platform.spec index 6ba3802..671aeb2 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -14,50 +14,53 @@ and tools. It provides a good starting environment for Haskell development. # ghci (ghc library) is not officially part of hackage-platform %define platform_progs()\ -%{?1}Requires: ghc-compiler = 7.0.4\ -%{?1}Requires: cabal-install = 0.10.2\ -%{?1}Requires: alex = 2.3.5\ -%{?1}Requires: happy = 1.18.6\ +%{?1}Requires: ghc-compiler = 7.4.1\ +%{?1}Requires: cabal-install = 0.13.3\ +%{?1}Requires: alex = 3.0.1\ +%{?1}Requires: happy = 1.18.9\ %{nil} # order here follows http://hackage.haskell.org/platform/changelog.html %define platform_libs()\ -%{?1}Requires: ghc-libraries = 7.0.4\ +%{?1}Requires: ghc-libraries = 7.4.1\ %{?1}Requires: ghc-cgi-devel = 3001.1.7.4\ %{?1}Requires: ghc-fgl-devel = 5.4.2.4\ %{?1}Requires: ghc-GLUT-devel = 2.1.2.1\ -%{?1}Requires: ghc-haskell-src-devel = 1.0.1.4\ +%{?1}Requires: ghc-haskell-src-devel = 1.0.1.5\ %{?1}Requires: ghc-html-devel = 1.0.1.2\ %{?1}Requires: ghc-HUnit-devel = 1.2.4.2\ %{?1}Requires: ghc-mtl-devel = 2.0.1.0\ -%{?1}Requires: ghc-network-devel = 2.3.0.5\ -%{?1}Requires: ghc-OpenGL-devel = 2.2.3.0\ -%{?1}Requires: ghc-parallel-devel = 3.1.0.1\ -%{?1}Requires: ghc-parsec-devel = 3.1.1\ -%{?1}Requires: ghc-QuickCheck-devel = 2.4.1.1\ +%{?1}Requires: ghc-network-devel = 2.3.0.11\ +%{?1}Requires: ghc-OpenGL-devel = 2.2.3.1\ +%{?1}Requires: ghc-parallel-devel = 3.2.0.2\ +%{?1}Requires: ghc-parsec-devel = 3.1.2\ +%{?1}Requires: ghc-QuickCheck-devel = 2.4.2\ +%{?1}Requires: ghc-random-devel = 1.0.1.1\ %{?1}Requires: ghc-regex-base-devel = 0.93.2\ %{?1}Requires: ghc-regex-compat-devel = 0.95.1\ %{?1}Requires: ghc-regex-posix-devel = 0.95.1\ %{?1}Requires: ghc-stm-devel = 2.2.0.1\ -%{?1}Requires: ghc-syb-devel = 0.3.3\ -%{?1}Requires: ghc-xhtml-devel = 3000.2.0.4\ -%{?1}Requires: ghc-zlib-devel = 0.5.3.1\ -%{?1}Requires: ghc-HTTP-devel = 4000.1.2\ -%{?1}Requires: ghc-deepseq-devel = 1.1.0.2\ -%{?1}Requires: ghc-text-devel = 0.11.1.5\ +%{?1}Requires: ghc-syb-devel = 0.3.6\ +%{?1}Requires: ghc-xhtml-devel = 3000.2.0.5\ +%{?1}Requires: ghc-zlib-devel = 0.5.3.3\ +%{?1}Requires: ghc-HTTP-devel = 4000.2.2\ +#%{?1}Requires: ghc-deepseq-devel = 1.1.0.2\ +%{?1}Requires: ghc-text-devel = 0.11.1.13\ %{?1}Requires: ghc-transformers-devel = 0.2.2.0\ %{nil} +%global upstream_version 2011.4.0.0 + Name: %{pkg_name} -Version: 2011.4.0.0 -Release: 7%{?dist} +Version: 2011.4.0.741 +Release: 1%{?dist} Summary: Standard Haskell distribution Group: Development/Tools License: BSD # BEGIN cabal2spec URL: http://hackage.haskell.org/platform -Source0: http://lambda.haskell.org/platform/download/%{version}/%{name}-%{version}.tar.gz +Source0: http://lambda.haskell.org/platform/download/%{upstream_version}/%{name}-%{upstream_version}.tar.gz ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} @@ -71,23 +74,24 @@ Requires: ghc-haskell-platform-devel = %{version} %{common_description} -%global top_prefix packages/%{name}-%{version} +%global top_prefix packages/%{name}-%{upstream_version} %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{upstream_version} %build -cd %{top_prefix} -%ghc_lib_build +#cd %{top_prefix} +#%%ghc_lib_build %install -TOPDIR=$(pwd) -cd %{top_prefix} -%ghc_lib_install +#TOPDIR=$(pwd) +#cd %{top_prefix} +#%%ghc_lib_install -mv ghc-%{name}-devel.files $TOPDIR +#mv ghc-%{name}-devel.files $TOPDIR +touch ghc-%{name}-devel.files # devel subpackage @@ -110,6 +114,10 @@ Obsoletes: ghc-%{name} < %{version}-%{release} %changelog +* Sat Mar 24 2012 Jens Petersen - 2011.4.0.741-1 +- update to ghc-7.4.1 and latest libraries +- temporarily just a meta-package + * Wed Mar 21 2012 Jens Petersen - 2011.4.0.0-7 - require ghc-compiler instead of ghc to avoid the ghc lib