[ghc-rpm-macros/f18] fix missing haddock html output due to using --hoogle without --html
Jens Petersen
petersen at fedoraproject.org
Tue Oct 9 03:32:44 UTC 2012
commit d71cfe3c3dd3eb1eb3366d875b72ae1b273091b8
Author: Jens Petersen <petersen at redhat.com>
Date: Tue Oct 9 12:32:36 2012 +0900
fix missing haddock html output due to using --hoogle without --html
ghc-rpm-macros.ghc | 2 +-
ghc-rpm-macros.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 76fc65e..387531b 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -258,7 +258,7 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
%ghc_lib_build()\
%ghc_lib_build_without_haddock\
%if %{undefined without_haddock}\
-%cabal haddock %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)} --hoogle\
+%cabal haddock --html %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)} --hoogle\
%endif\
%{nil}
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 04dea32..d95e5c3 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -4,9 +4,11 @@
# uncomment to bootstrap without hscolour
#%%global without_hscolour 1
+# uncomment to unbootstrap hscolour on again
+#%%undefine without_hscolour
Name: ghc-rpm-macros
-Version: 0.95.7
+Version: 0.95.8
Release: 1%{?dist}
Summary: Macros for building packages for GHC
@@ -80,6 +82,9 @@ EOF
%changelog
+* Tue Oct 9 2012 Jens Petersen <petersen at redhat.com> - 0.95.8-1
+- "cabal haddock" needs --html option with --hoogle to output html
+
* Wed Sep 19 2012 Jens Petersen <petersen at redhat.com> - 0.95.7-1
- fix broken duplicate hash output for haskell-platform binaries buildhack
when haskell-platform locally installed
More information about the scm-commits
mailing list