rpms/ghc/devel ghc-6.12.1-gen_contents_index-haddock-path.patch, NONE, 1.1 ghc.spec, 1.115, 1.116

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6510

Modified Files:
	ghc.spec 
Added Files:
	ghc-6.12.1-gen_contents_index-haddock-path.patch 
Log Message:
- add ghc-6.12.1-gen_contents_index-haddock-path.patch to adjust haddock path
  since we removed html/ from libraries path



ghc-6.12.1-gen_contents_index-haddock-path.patch:
 gen_contents_index |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ghc-6.12.1-gen_contents_index-haddock-path.patch ---
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


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- ghc.spec	12 Dec 2009 10:47:38 -0000	1.115
+++ ghc.spec	12 Dec 2009 11:34:17 -0000	1.116
@@ -54,6 +54,7 @@ BuildRequires: libxslt, docbook-style-xs
 %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 internal
 
 %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 at redhat.com> - 6.12.1-0.2
 - remove redundant mingw and perl from ghc-tarballs/