[ghc-rpm-macros] ghc_bootstrap: add ghc_without_dynamic and drop without_hscolour
Jens Petersen
petersen at fedoraproject.org
Fri Jun 17 08:55:23 UTC 2011
commit 4773ef18ac4c7566676db9e221d4ad356ef7d022
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Jun 17 17:55:06 2011 +0900
ghc_bootstrap: add ghc_without_dynamic and drop without_hscolour
ghc-rpm-macros.ghc | 3 ++-
ghc-rpm-macros.spec | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 48fb713..dab9753 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -215,11 +215,12 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
%{nil}
# skip shared and prof libs, documentation, and testsuite
+# - without_hscolour needs to be set locally in the spec file
%ghc_bootstrap\
%global ghc_bootstrapping 1\
%global ghc_without_shared 1\
+%global ghc_without_dynamic 1\
%global without_prof 1\
%global without_haddock 1\
-%global without_hscolour 1\
%global without_manual 1\
%global without_testsuite 1
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 137ccd2..33125c1 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.13.5
+Version: 0.13.6
Release: 1%{?dist}
Summary: Macros for building packages for GHC
@@ -59,6 +59,10 @@ EOF
%changelog
+* Fri Jun 17 2011 Jens Petersen <petersen at redhat.com> - 0.13.6-1
+- also set ghc_without_dynamic for ghc_bootstrap
+- drop without_hscolour from ghc_bootstrap: doesn't work for koji
+
* Fri Jun 17 2011 Jens Petersen <petersen at redhat.com> - 0.13.5-1
- ghc_bootstrap is now a macro which sets ghc_bootstrapping,
ghc_without_shared, without_prof, without_haddock, without_hscolour,
More information about the scm-commits
mailing list