- add ghc-6.12.1-gen_contents_index-haddock-path.patch to adjust haddock

path since we removed html/ from libraries path
This commit is contained in:
Jens Petersen 2009-12-12 11:34:17 +00:00
parent feffa93079
commit bedcaee130
2 changed files with 17 additions and 0 deletions

View File

@ -0,0 +1,12 @@
diff -u ghc-6.12.1/libraries/gen_contents_index\~ ghc-6.12.1/libraries/gen_contents_index
--- ghc-6.12.1/libraries/gen_contents_index~ 2009-12-11 04:11:33.000000000 +1000
+++ ghc-6.12.1/libraries/gen_contents_index 2009-12-12 21:08:02.000000000 +1000
@@ -20,7 +20,7 @@
done
;;
*)
- HADDOCK=../../../../../bin/haddock
+ HADDOCK=/usr/bin/haddock
# We don't want the GHC API to swamp the index
HADDOCK_FILES=`ls -1 */*.haddock | grep -v '/ghc\.haddock' | sort`
for HADDOCK_FILE in $HADDOCK_FILES

View File

@ -54,6 +54,7 @@ BuildRequires: libxslt, docbook-style-xsl
%if %{with hscolour}
BuildRequires: hscolour
%endif
Patch1: ghc-6.12.1-gen_contents_index-haddock-path.patch
%description
GHC is a state-of-the-art programming suite for Haskell, a purely
@ -143,6 +144,8 @@ Profiling libraries for the ghc internals library.
%prep
%setup -q -n %{name}-%{version} %{?with_extralibs:-b1}
# tweak haddock path for html/libraries -> libraries
%patch1 -p1 -b .orig
# make sure we don't use these
rm -r ghc-tarballs/{mingw,perl}
@ -349,6 +352,8 @@ fi
- use ghc_reindex_haddock
- add scripts for ghc-ghc-devel and ghc-ghc-doc
- add doc bcond
- add ghc-6.12.1-gen_contents_index-haddock-path.patch to adjust haddock path
since we removed html/ from libraries path
* Sat Dec 12 2009 Jens Petersen <petersen@redhat.com> - 6.12.1-0.2
- remove redundant mingw and perl from ghc-tarballs/