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

This commit is contained in:
Jens Petersen 2011-05-02 20:34:56 +09:00
parent 109aae23e7
commit 03f30c40ef

View File

@ -10,8 +10,6 @@
%bcond_without manual %bcond_without manual
# run testsuite # run testsuite
%bcond_with testsuite %bcond_with testsuite
# include colored html src
%bcond_without hscolour
# use system libffi # use system libffi
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
%bcond_without libffi %bcond_without libffi
@ -76,7 +74,7 @@ Requires: ghc-base-devel
%if %{with manual} %if %{with manual}
BuildRequires: libxslt, docbook-style-xsl BuildRequires: libxslt, docbook-style-xsl
%endif %endif
%if %{with hscolour} %if %{undefined without_hscolour}
BuildRequires: hscolour BuildRequires: hscolour
%endif %endif
%if %{with testsuite} %if %{with testsuite}
@ -203,7 +201,7 @@ GhcStage2HcOpts = -O0 -fasm
GhcLibHcOpts = -O0 -fasm GhcLibHcOpts = -O0 -fasm
SplitObjs = NO SplitObjs = NO
%endif %endif
%if %{without hscolour} %if %{undefined without_hscolour}
HSCOLOUR_SRCS = NO HSCOLOUR_SRCS = NO
%endif %endif
%if %{with libffi} %if %{with libffi}