From 21e17e346811bde0b6a4cd151a648c1942ebfc50 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Fri, 26 Nov 2010 12:29:14 +1000
Subject: [PATCH] drop with_devhelp since html-help option gone from
 haddock-2.8.0

---
 ghc-rpm-macros.ghc  | 2 +-
 ghc-rpm-macros.spec | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 3e72baf..cacfd83 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -187,7 +187,7 @@ find $RPM_BUILD_ROOT -type f -exec sh -c "file {} | grep -q 'dynamically linked'
 %ghc_lib_build\
 %cabal_configure --ghc -p\
 %cabal build\
-%cabal haddock %{!?without_hscolour:--hyperlink-source} %{?with_devhelp:--haddock-option=--html-help=devhelp}
+%cabal haddock %{!?without_hscolour:--hyperlink-source}
 
 # ghc_bin_install
 %ghc_bin_install\
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 5ce3994..a6655a8 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov 26 2010 Jens Petersen <petersen@redhat.com>
+- drop with_devhelp since --html-help option gone from haddock-2.8.0
+
 * Tue Nov 23 2010 Jens Petersen <petersen@redhat.com> - 0.10.2-1
 - ignore ghc's builtin pseudo-libs