- up to 6.12.1, extralibs no longer exist

Changed files:
    ghc.spec -> 1.103

diff --git a/ghc.spec b/ghc.spec
index 7e7213311311df63837abac2718b29b04c960ca0..b82ca27fa4be0d0bfde6b9edb06162ca67a05b71 100644 (file)
--- a/ghc.spec
+++ b/ghc.spec
@@ -12,23 +12,20 @@
 %bcond_with    bootstrap       # use foreign (non-rpm) ghc to bootstrap (extra 140MB to download)
 %bcond_with    unregistered    # non-registerised interpreter (use for build problems/new arches)
 %bcond_without doc             # don't build documentation (requires haddock)
-%bcond_without extralibs       # don't build extra libs
 #
 Summary:       Glasgow Haskell Compilation system
 Summary(pl.UTF-8):     System kompilacji Glasgow Haskell
 Name:          ghc
-Version:       6.10.4
-Release:       5
+Version:       6.12.1
+Release:       0.1
 License:       BSD-like w/o adv. clause
 Group:         Development/Languages
 Source0:       http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
-# Source0-md5: 167687fa582ef6702aaac24e139ec982
-Source1:       http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src-extralibs.tar.bz2
-# Source1-md5: 37ce285617d7cebabc3cf6805bdbca25
+# Source0-md5: 3a2b23f29013605f721ebdfc29de9c92
 %if %{with bootstrap}
-Source3:       http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-i386-unknown-linux.tar.bz2
+Source3:       http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-i386-unknown-linux-n.tar.bz2
 # Source3-md5: ba9eefecf9753a391d84ffe9f8515e1c
-Source4:       http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-x86_64-unknown-linux.tar.bz2
+Source4:       http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-x86_64-unknown-linux-n.tar.bz2
 # Source4-md5: 3521c5a12808811d32f9950fe7a3815c
 %endif
 Patch0:                %{name}-cabal-flags.patch
@@ -113,7 +110,7 @@ Biblioteki profilujące dla GHC. Powinny być zainstalowane kiedy
 potrzebujemy systemu profilującego z GHC.
 
 %prep
-%setup -q %{?with_extralibs:-b1}
+%setup -q
 %if %{with bootstrap}
 %ifarch %{ix86}
 %{__tar} -xjf %{SOURCE3}
@@ -132,11 +129,10 @@ sed -i -e 's,fp_ghc_pkg_guess" -l,fp_ghc_pkg_guess" list,' configure
 cat <<'EOF' > mk/build.mk
 #GhcStage1HcOpts += -O0 -Wall
 #GhcStage2HcOpts += -O0 -Wall
-SRC_HC_OPTS      += -lffi -O0 -H64m
-GhcHcOpts        += -Rghc-timing
+#SRC_HC_OPTS      += -lffi -O0 -H64m
+#GhcHcOpts        += -Rghc-timing
 #GhcLibHcOpts     += -O -dcore-lint -keep-hc-files
 SplitObjs        += NO
-#GhcBootLibs     += %{!?with_extralibs:NO}%{?with_extralibs:YES}
 HADDOCK_DOCS     += %{!?with_doc:NO}%{?with_doc:YES}
 XSLTPROC_OPTS    += --nonet
 EOF
@@ -163,9 +159,9 @@ if [ ! -f .bindist.install.mark ]; then
 
        touch .bindist.install.mark
 fi
-%endif
 
-%{?with_bootstrap:PATH=$top/bindist/bin:$PATH:%{_prefix}/local/bin}
+PATH=$top/bindist/bin:$PATH:%{_prefix}/local/bin
+%endif
 
 %configure \
        --prefix=%{_prefix} \