rpms
/
ghc
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- fix broken urls to haddock docs created by gen_contents_index script 

- avoid haddock errors when upgrading by making doc post script posttrans
This commit is contained in:
Jens Petersen 2008-11-11 03:48:10 +00:00
parent f20412293b
commit 6c9b784686
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghc-6.10.1-gen_contexts_index.patch Normal file
View File

@ -0,0 +1,12 @@
diff -u ghc/libraries/gen_contents_index~ ghc/libraries/gen_contents_index
--- ghc-6.10.1/libraries/gen_contents_index~ 2008-11-06 11:18:45.000000000 +1000
+++ ghc-6.10.1/libraries/gen_contents_index 2008-11-10 17:53:12.000000000 +1000
@@ -23,7 +23,7 @@
for HADDOCK_FILE in $HADDOCK_FILES
do
- NAME=` echo "$HADDOCK_FILE" | sed 's#/dist/.*##' | sed 's#.*/##' `
+ NAME=` echo "$HADDOCK_FILE" | sed 's#/dist/.*##' | sed 's#.*/##' | sed 's#\.haddock##' `
HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
NAMES="$NAMES $NAME"
done

13
ghc.spec
View File

@ -16,7 +16,7 @@
Name: ghc
Version: 6.10.1
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Glasgow Haskell Compilation system
# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
ExcludeArch: alpha ppc64
@ -37,6 +37,7 @@ BuildRequires: gmp-devel, libedit-devel
%if %{build_doc}
BuildRequires: libxslt, docbook-style-xsl
%endif
Patch1: ghc-6.10.1-gen_contexts_index.patch
%description
GHC is a state-of-the-art programming suite for Haskell, a purely
@ -78,6 +79,7 @@ you like to have local access to the documentation in HTML format.
%prep
%setup -q -n %{name}-%{version} -b1
%patch1 -p1 -b .orig
%build
# hack for building a local test package quickly from a prebuilt tree
@ -173,11 +175,12 @@ update-alternatives --install %{_bindir}/runhaskell runhaskell \
update-alternatives --install %{_bindir}/hsc2hs hsc2hs \
%{_bindir}/hsc2hs-ghc 500
%post doc
# posttrans to make sure any old documentation has been removed first
%posttrans doc
( cd %{_docdir}/ghc/libraries && ./gen_contents_index ) || :
%preun
if test "$1" = 0; then
if [ "$1" = 0 ]; then
update-alternatives --remove runhaskell %{_bindir}/runghc
update-alternatives --remove hsc2hs %{_bindir}/hsc2hs-ghc
fi
@ -214,6 +217,10 @@ fi
%endif
%changelog
* Tue Nov 11 2008 Jens Petersen <petersen@redhat.com> - 6.10.1-4
- fix broken urls to haddock docs created by gen_contents_index script
- avoid haddock errors when upgrading by making doc post script posttrans
* Wed Nov 05 2008 Bryan O'Sullivan <bos@serpentine.com> - 6.10.1-3
- libraries/prologue.txt should not have been ghosted