[ghc/f15/master] replace hscolour bcond by without_hscolour like in ghc-rpm-macros

Jens Petersen petersen at fedoraproject.org
Fri May 6 07:30:58 UTC 2011


commit 6773b65954d2bfb700ca6a0ac02d6ab3d853fbef
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri May 6 16:30:46 2011 +0900

    replace hscolour bcond by without_hscolour like in ghc-rpm-macros

 ghc.spec |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/ghc.spec b/ghc.spec
index 72b8a58..8c8b901 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -10,8 +10,6 @@
 %bcond_without manual
 # run testsuite
 %bcond_with testsuite
-# include colored html src
-%bcond_without hscolour
 # use system libffi
 %ifarch %{ix86} x86_64
 %bcond_without libffi
@@ -76,7 +74,7 @@ Requires: ghc-base-devel
 %if %{with manual}
 BuildRequires: libxslt, docbook-style-xsl
 %endif
-%if %{with hscolour}
+%if %{undefined without_hscolour}
 BuildRequires: hscolour
 %endif
 %if %{with testsuite}
@@ -203,7 +201,7 @@ GhcStage2HcOpts = -O0 -fasm
 GhcLibHcOpts = -O0 -fasm
 SplitObjs = NO
 %endif
-%if %{without hscolour}
+%if %{undefined without_hscolour}
 HSCOLOUR_SRCS = NO
 %endif
 %if %{with libffi}


More information about the scm-commits mailing list