Accepting request 140977 from devel:languages:haskell

- Bootstrap ghc 7.4.2 (needed for Haskell Platform 2012.4).
- Removed binary distribution and spec file modifications for that.
- Next step will be self-bootstrap of ghc 7.4.2 after this SR has been built in Factory and we will have a working ghc in Factory.

OBS-URL: https://build.opensuse.org/request/show/140977
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc?expand=0&rev=3

ghc-7.4.1-i386-unknown-linux.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35004c0647f6719650381eea65d3e61c133003f867f04502e035401e40849e1b
-size 120765176

ghc-7.4.1-src.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:721c09a49e519b7459b67b451b5103252ba3833906a7a24c3a3679ff94669a79
-size 25272609

ghc-7.4.1-x86_64-unknown-linux.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e699ec96312c9d231d84842f6a58b120d64da0f41f10dba1cdba6c2d512a77dc
-size 120012932

ghc-7.4.2-src.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2ee1289a33cc70539287129841acc7eaf16112bb60c59b5a6ee91887bfd836d
+size 25836446

ghc.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Nov 12 12:53:10 UTC 2012 - peter.trommler@ohm-hochschule.de
+
+- remove binary distributions after bootstrap in Factory 
+
+-------------------------------------------------------------------
+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
 

ghc.spec

@@ -2,7 +2,6 @@
 # spec file for package ghc
 #
 # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2011, 2012 Peter Trommler peter.trommler@ohm-hochschule.de
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,16 +25,14 @@
 #%%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}
-# end bootstrap
 %if %{defined ghc_bootstrapping}
 BuildRequires:  ghc-compiler >= 6.12
 %else
@@ -73,9 +70,6 @@ BuildRequires:  ghc-time
 BuildRequires:  ghc-unix
 %endif
 %endif
-# Remove after initial bootstrap
-%endif
-#end bootstrap
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc
@@ -98,12 +92,6 @@ Requires:       ghc-compiler = %{version}-%{release}
 Requires:       ghc-ghc-devel = %{version}-%{release}
 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}
-Source1:        %{name}-%{bootstrap_version}-%{_arch}-unknown-linux.tar.bz2
-# NoSource:       1
-# end bootstrap
 # PATCH-FIX-UPSTREAM ghc-use-system-libffi.patch peter.trommler@ohm-hochschule.de - See Haskell trac #4496 and #5743
 Patch:          ghc-use-system-libffi.patch
 # PATCH-FIX-UPSTREAM ghc-suse-as-needed.patch peter.trommler@ohm-hochschule.de -- temporary fix for Haskell trac #7062, ghc libraries do not work with as_needed and new-dtags both enabled
@@ -153,22 +141,16 @@ To install all of GHC install package ghc.
 %global ghc_version_override %{version}
 
 
-# Remove after initial bootstrap
-%if %{defined without_binary_ghc}
-# end bootstrap
 %global _use_internal_dependency_generator 0
 %global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}
 %global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}
-# Remove after initial bootstrap
-%endif
-# end bootstrap
 
 %global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
 
 %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 +171,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}
@@ -209,9 +191,6 @@ This is a meta-package for all the development library packages in GHC
 except the ghc library, which is installed by the toplevel ghc metapackage.
 
 %prep
-# Remove after initial bootstrap
-%setup -q -T -c -n bootstrap -a 1
-#end bootstrap
 %setup -q
 rm -r ghc-tarballs/{mingw,perl}
 %patch -p1 -b .libffi
@@ -226,13 +205,6 @@ ln -s $(pkg-config --variable=includedir libffi)/*.h rts/dist/build
 %patch6 -p1
 
 %build
-# Remove after initial bootstrap
-pushd ../bootstrap/%{name}-%{bootstrap_version}
-./configure --prefix %{_builddir}/ghc
-make install
-popd
-# end bootstrap
-
 # required for patch1
 autoreconf -fi
 
@@ -258,7 +230,6 @@ export CFLAGS="${CFLAGS:-%optflags}"
   --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
   --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
   --docdir=%{ghcdocroot} \
-  --with-ghc=%{_builddir}/ghc/bin/ghc\
   --with-gcc=%{_bindir}/gcc
 
 make %{?_smp_mflags}