[ghc/f18] enable hscolour, drop hscolour BR, without_hscolour bootstrap now in ghc-rpm-macros

[Jens Petersen]

commit 56a1888d580ac960a5c14109b0c4e75dd92dcabb
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Oct 25 19:31:21 2012 +0900

    enable hscolour, drop hscolour BR, without_hscolour bootstrap now in ghc-rpm-macros

 ghc.spec |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/ghc.spec b/ghc.spec
index 5aacc00..897a814 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -1,16 +1,14 @@
 # Shared haskell libraries are supported for x86* archs
 # (disabled for other archs in ghc-rpm-macros)
 
-# To bootstrap a new version of ghc, uncomment the following:
+# To bootstrap build a new version of ghc, uncomment the following:
 #%%global ghc_bootstrapping 1
 #%%{?ghc_bootstrap}
-#%%global without_hscolour 1
 #%%global without_testsuite 1
 
 # To do a test build instead with shared libs, uncomment the following:
 #%%global ghc_bootstrapping 1
 #%%{?ghc_test}
-#%%global without_hscolour 1
 #%%global without_testsuite 1
 
 # unregisterized archs
@@ -30,7 +28,7 @@ Version: 7.4.1
 # - release can only be reset if all library versions get bumped simultaneously
 #   (eg for a major release)
 # - minor release numbers should be incremented monotonically
-Release: 6.2%{?dist}
+Release: 6.3%{?dist}
 Summary: Glasgow Haskell Compiler
 # fedora ghc has been bootstrapped on
 # %{ix86} x86_64 ppc alpha sparcv9 ppc64 armv7hl armv5tel s390 s390x
@@ -68,9 +66,6 @@ BuildRequires: ncurses-devel
 %if %{undefined without_manual}
 BuildRequires: libxslt, docbook-style-xsl
 %endif
-%if %{undefined without_haddock} && %{undefined without_hscolour}
-BuildRequires: hscolour
-%endif
 %if %{undefined without_testsuite}
 BuildRequires: python
 %endif
@@ -250,9 +245,6 @@ HADDOCK_DOCS = NO
 %if %{defined without_manual}
 BUILD_DOCBOOK_HTML = NO
 %endif
-%if %{undefined without_hscolour}
-HSCOLOUR_SRCS = NO
-%endif
 %ifarch armv7hl
 SRC_HC_OPTS += -D__ARM_PCS_VFP
 %endif
@@ -436,6 +428,11 @@ fi
 %files libraries
 
 %changelog
+* Thu Oct 25 2012 Jens Petersen <petersen at redhat.com> - 7.4.1-6.3
+- do not disable hscolour in build.mk
+- drop the explicit hscolour BR
+- without_hscolour should now be set by ghc-rpm-macros for bootstrapping
+
 * Wed Oct 24 2012 Jens Petersen <petersen at redhat.com> - 7.4.1-6.2
 - bring back the HS*.o lib files since ghci loads them faster
   (see http://hackage.haskell.org/trac/ghc/ticket/7249)