[ghc-rpm-macros] allow dynamic linking of Setup with ghc_without_shared set

[Jens Petersen]

commit ab41e2f6c8b5aa514d34306a5fc08832aa3bb578
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Jan 19 18:33:08 2012 +0900

    allow dynamic linking of Setup with ghc_without_shared set

 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 0915eec..e620a83 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -2,7 +2,7 @@
 # see https://fedoraproject.org/wiki/PackagingDrafts/Haskell for more details
 
 # "cabal"
-%cabal [ -x Setup ] || ghc --make %{!?ghc_user_conf:-no-user-package-conf} %{!?ghc_without_shared:%{!?ghc_without_dynamic:-dynamic}} Setup\
+%cabal [ -x Setup ] || ghc --make %{!?ghc_user_conf:-no-user-package-conf} %{!?ghc_without_dynamic:-dynamic} Setup\
 ./Setup
 
 # check ghc version was rebuilt against self
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 4b57e29..303e00a 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -3,7 +3,7 @@
 %global macros_file %{_sysconfdir}/rpm/macros.ghc
 
 Name:           ghc-rpm-macros
-Version:        0.15.3
+Version:        0.15.4
 Release:        1%{?dist}
 Summary:        Macros for building packages for GHC
 
@@ -59,6 +59,9 @@ EOF
 
 
 %changelog
+* Thu Jan 19 2012 Jens Petersen <petersen at redhat.com> - 0.15.4-1
+- allow dynamic linking of Setup with ghc_without_shared set
+
 * Fri Jan  6 2012 Jens Petersen <petersen at redhat.com> - 0.15.3-1
 - new ghc_add_basepkg_file to add a path to base lib package filelist