diff --git a/ghc-7.4.1-src.tar.bz2 b/ghc-7.4.1-src.tar.bz2 deleted file mode 100644 index 22ca771..0000000 --- a/ghc-7.4.1-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:721c09a49e519b7459b67b451b5103252ba3833906a7a24c3a3679ff94669a79 -size 25272609 diff --git a/ghc-7.4.2-src.tar.bz2 b/ghc-7.4.2-src.tar.bz2 new file mode 100644 index 0000000..8439acc --- /dev/null +++ b/ghc-7.4.2-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2ee1289a33cc70539287129841acc7eaf16112bb60c59b5a6ee91887bfd836d +size 25836446 diff --git a/ghc.changes b/ghc.changes index dc195c9..bab0c85 100644 --- a/ghc.changes +++ b/ghc.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Nov 8 22:24:25 UTC 2012 - peter.trommler@ohm-hochschule.de + +- Update to version 7.4.2 from upstream +* Required by Haskell Platform 2012.4.0.0 +* Fixes for ghc and ghci + +------------------------------------------------------------------- +Thu Nov 8 19:58:08 UTC 2012 - peter.trommler@ohm-hochschule.de + +- add ExclusiveArch tag + ------------------------------------------------------------------- Tue Nov 6 14:41:06 UTC 2012 - peter.trommler@ohm-hochschule.de diff --git a/ghc.spec b/ghc.spec index 6af9cde..5a496ff 100644 --- a/ghc.spec +++ b/ghc.spec @@ -26,12 +26,13 @@ #%%global debug_package %{nil} Name: ghc -Version: 7.4.1 +Version: 7.4.2 Release: 0 Url: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2 Summary: The Glorious Glasgow Haskell Compiler License: BSD-3-Clause Group: Development/Languages/Other +ExclusiveArch: %{ix86} x86_64 # Remove after initial bootstrap %if %{defined without_binary_ghc} @@ -100,7 +101,7 @@ Requires: ghc-libraries = %{version}-%{release} Source: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2 # remove after initial bootstrap # Binary distributions for initial bootstrap -%global bootstrap_version %{version} +%global bootstrap_version 7.4.1 Source1: %{name}-%{bootstrap_version}-%{_arch}-unknown-linux.tar.bz2 # NoSource: 1 # end bootstrap @@ -168,7 +169,7 @@ To install all of GHC install package ghc. %if %{defined ghclibdir} %ghc_lib_subpackage Cabal 1.14.0 %ghc_lib_subpackage array 0.4.0.0 -%ghc_lib_subpackage -c gmp-devel,libffi-devel base 4.5.0.0 +%ghc_lib_subpackage -c gmp-devel,libffi-devel base 4.5.1.0 %ghc_lib_subpackage binary 0.5.1.0 %ghc_lib_subpackage bytestring 0.9.2.1 %ghc_lib_subpackage containers 0.4.2.1 @@ -189,7 +190,7 @@ To install all of GHC install package ghc. %ghc_lib_subpackage process 1.1.0.1 %ghc_lib_subpackage template-haskell 2.7.0.0 %ghc_lib_subpackage time 1.4 -%ghc_lib_subpackage unix 2.5.1.0 +%ghc_lib_subpackage unix 2.5.1.1 %endif %global version %{ghc_version_override}