[ghc/f18] silence the doc re-indexing script (#870694)

[Jens Petersen]

commit f1a6313a414956686a803a05a868b5768fae6567
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Oct 30 19:23:13 2012 +0900

    silence the doc re-indexing script (#870694)

 ghc-7.4-silence-gen_contents_index.patch |   11 +++++++++++
 ghc.spec                                 |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/ghc-7.4-silence-gen_contents_index.patch b/ghc-7.4-silence-gen_contents_index.patch
new file mode 100644
index 0000000..d000b8b
--- /dev/null
+++ b/ghc-7.4-silence-gen_contents_index.patch
@@ -0,0 +1,11 @@
+--- ghc-7.4.1/libraries/gen_contents_index~	2012-09-30 16:14:39.368295240 +0900
++++ ghc-7.4.1/libraries/gen_contents_index	2012-10-30 19:12:10.017398594 +0900
+@@ -50,7 +50,7 @@
+ esac
+ 
+ # Now create the combined contents and index pages
+-echo $HADDOCK_ARGS
++#echo $HADDOCK_ARGS
+ $HADDOCK --gen-index --gen-contents -o . \
+          -t "Haskell Hierarchical Libraries" \
+          -p "prologue.txt" \
diff --git a/ghc.spec b/ghc.spec
index 897a814..419f089 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -28,7 +28,7 @@ Version: 7.4.1
 # - release can only be reset if all library versions get bumped simultaneously
 #   (eg for a major release)
 # - minor release numbers should be incremented monotonically
-Release: 6.3%{?dist}
+Release: 6.4%{?dist}
 Summary: Glasgow Haskell Compiler
 # fedora ghc has been bootstrapped on
 # %{ix86} x86_64 ppc alpha sparcv9 ppc64 armv7hl armv5tel s390 s390x
@@ -101,6 +101,7 @@ Patch13: ghc-debian-ARM-VFPv3D16.patch
 Patch14: ghc-debian-armhf_llvm_abi.patch
 Patch15: ghc-llvmGen-fence-instruction.patch
 Patch16: ghc-llvmGen-improve-write-barrier.patch
+Patch17: ghc-7.4-silence-gen_contents_index.patch
 
 %description
 GHC is a state-of-the-art, open source, compiler and interactive environment
@@ -202,9 +203,12 @@ except the ghc library, which is installed by the toplevel ghc metapackage.
 
 %prep
 %setup -q -n %{name}-%{version} %{!?without_testsuite:-b2}
+
+# tweaks to gen_contents_index
 %patch1 -p1 -b .orig
 %patch2 -p1
 %patch3 -p1
+%patch17 -p1
 
 # make sure we don't use these
 rm -r ghc-tarballs/{mingw,perl}
@@ -428,6 +432,9 @@ fi
 %files libraries
 
 %changelog
+* Tue Oct 30 2012 Jens Petersen <petersen at redhat.com> - 7.4.1-6.4
+- silence the doc re-indexing script (#870694)
+
 * Thu Oct 25 2012 Jens Petersen <petersen at redhat.com> - 7.4.1-6.3
 - do not disable hscolour in build.mk
 - drop the explicit hscolour BR