[ghc-rpm-macros/f18] BR redhat-rpm-config not ghc-rpm-macros; don't set without_hscolour in macros.ghc

[Jens Petersen]

commit 14a268b914f46f3e33eeeaa8f944055540913aad
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Oct 25 19:28:27 2012 +0900

    BR redhat-rpm-config not ghc-rpm-macros; don't set without_hscolour in macros.ghc

 ghc-rpm-macros.spec |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index d95e5c3..7e822f5 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -4,12 +4,10 @@
 
 # uncomment to bootstrap without hscolour
 #%%global without_hscolour 1
-# uncomment to unbootstrap hscolour on again
-#%%undefine without_hscolour
 
 Name:           ghc-rpm-macros
 Version:        0.95.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Macros for building packages for GHC
 
 Group:          Development/Libraries
@@ -27,8 +25,8 @@ Source3:        ghc-deps.sh
 Source4:        cabal-tweak-dep-ver
 Requires:       redhat-rpm-config
 %if %{undefined without_hscolour}
+BuildRequires:  redhat-rpm-config
 ExclusiveArch:  %{ghc_arches}
-BuildRequires:  ghc-rpm-macros
 Requires:       hscolour
 %endif
 
@@ -65,14 +63,6 @@ cat >> %{buildroot}/%{macros_file} <<EOF
 EOF
 %endif
 
-%if %{defined without_hscolour}
-cat >> %{buildroot}/%{macros_file} <<EOF
-
-# bootstrap
-%%without_hscolour 1
-EOF
-%endif
-
 
 %files
 %doc COPYING AUTHORS
@@ -82,6 +72,10 @@ EOF
 
 
 %changelog
+* Thu Oct 25 2012 Jens Petersen <petersen at redhat.com> - 0.95.8-2
+- BR redhat-rpm-config instead of ghc-rpm-macros
+- no longer set without_hscolour in macros.ghc for bootstrapping
+
 * Tue Oct  9 2012 Jens Petersen <petersen at redhat.com> - 0.95.8-1
 - "cabal haddock" needs --html option with --hoogle to output html