[ghc-rpm-macros] do bcond cabal configure --enable-tests for both Bin and Lib pkgs

[Jens Petersen]

commit 972cb47448c292bcb8593bcfa03abc795ce979a0
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri May 16 23:47:47 2014 +0900

    do bcond cabal configure --enable-tests for both Bin and Lib pkgs

 ghc-rpm-macros.ghc  |    4 ++--
 ghc-rpm-macros.spec |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index ad6bcfc..ec199a9 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -21,7 +21,7 @@ fi
 # configure
 %cabal_configure\
 %ghc_check_bootstrap\
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} --ghc-option=-O2 %{?cabal_configure_options} $cabal_configure_extra_options
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} --ghc-option=-O2 %{?with_tests:--enable-tests} %{?cabal_configure_options} $cabal_configure_extra_options
 
 # install
 %cabal_install %cabal copy --destdir=%{buildroot} -v
@@ -87,7 +87,7 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.
 # ghc_lib_build_without_haddock [name] [version]
 %ghc_lib_build_without_haddock()\
 %global debug_package %{nil}\
-%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} %{?with_tests:--enable-tests}\
+%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
 %cabal build\
 %{nil}
 
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 764922a..16b41fb 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        1.2.9
+Version:        1.2.10
 Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
@@ -108,6 +108,9 @@ EOF
 
 
 %changelog
+* Fri May 16 2014 Jens Petersen <petersen at redhat.com> - 1.2.10-1
+- do bcond cabal configure --enable-tests also for Bin packages
+
 * Fri May 16 2014 Jens Petersen <petersen at redhat.com> - 1.2.9-1
 - enable configure bcond check for tests