[darcs] build with haddock-2.10.0 to workaround failure with ghc-7.4.2 haddock-2.11.0

Jens Petersen petersen at fedoraproject.org
Mon Mar 25 02:01:02 UTC 2013


commit a0ed1fb93c3a27597c3db914e68f6a0434fce089
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Mar 25 11:00:50 2013 +0900

    build with haddock-2.10.0 to workaround failure with ghc-7.4.2 haddock-2.11.0

 darcs.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/darcs.spec b/darcs.spec
index cfa80ce..473161f 100644
--- a/darcs.spec
+++ b/darcs.spec
@@ -57,6 +57,8 @@ BuildRequires:  ghc-vector-devel
 BuildRequires:  ghc-zlib-devel
 BuildRequires:  libcurl-devel%{?_isa}
 # End cabal-rpm deps
+# workaround haddocks not building with 2.11.0 (ghc-7.4.2)
+BuildRequires:  haddock
 Obsoletes:      darcs-server < 2.2.1-6
 
 %description
@@ -73,6 +75,7 @@ Obsoletes:      darcs-server < 2.2.1-6
 
 
 %build
+cabal_configure_extra_options=--with-haddock=%{_bindir}/haddock-2.10.0
 %ghc_lib_build
 
 
@@ -114,6 +117,8 @@ Obsoletes: ghc-darcs%{!?beta:-beta}-devel < %{version}-%{release}
 * Tue Mar 19 2013 Jens Petersen <petersen at redhat.com> - 2.8.4-1
 - update to 2.8.4
 - libcurl-devel no longer provides curl-devel
+- use haddock-2.10.0 to build library documentation to workaround failure
+  with ghc-7.4.2's haddock-2.11.0
 
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild


More information about the scm-commits mailing list