rpms/ghc/devel ghc-6.10.1-gen_contexts_index.patch, NONE, 1.1 ghc.spec, 1.59, 1.60
Jens Petersen
petersen at fedoraproject.org
Tue Nov 11 03:48:11 UTC 2008
Author: petersen
Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29308
Modified Files:
ghc.spec
Added Files:
ghc-6.10.1-gen_contexts_index.patch
Log Message:
- fix broken urls to haddock docs created by gen_contents_index script
- avoid haddock errors when upgrading by making doc post script posttrans
ghc-6.10.1-gen_contexts_index.patch:
--- NEW FILE ghc-6.10.1-gen_contexts_index.patch ---
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
Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ghc.spec 5 Nov 2008 22:19:30 -0000 1.59
+++ ghc.spec 11 Nov 2008 03:48:10 -0000 1.60
@@ -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 @@
%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 @@
%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}/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 @@
%endif
%changelog
+* Tue Nov 11 2008 Jens Petersen <petersen at 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 at serpentine.com> - 6.10.1-3
- libraries/prologue.txt should not have been ghosted
More information about the fedora-extras-commits
mailing list