From 0273f7e1eb54619b8240efe964afd4909084cc9c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 16 May 2014 23:25:42 +0900 Subject: [PATCH] enable configure bcond check for tests --- ghc-rpm-macros.ghc | 2 +- ghc-rpm-macros.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 4a28def..ad6bcfc 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -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}\ +%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 build\ %{nil} diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 9e587d0..764922a 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.8 +Version: 1.2.9 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -108,6 +108,9 @@ EOF %changelog +* Fri May 16 2014 Jens Petersen - 1.2.9-1 +- enable configure bcond check for tests + * Tue May 13 2014 Jens Petersen - 1.2.8-1 - use -O2 also for executable (Bin) packages and allow it to be overrided