diff --git a/ghc-6.10.1-gen_contexts_index.patch b/ghc-6.10.1-gen_contexts_index.patch deleted file mode 100644 index aff35a3..0000000 --- a/ghc-6.10.1-gen_contexts_index.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/ghc.spec b/ghc.spec index a8cf23b..72010ee 100644 --- a/ghc.spec +++ b/ghc.spec @@ -15,8 +15,8 @@ %global package_debugging 0 Name: ghc -Version: 6.10.1 -Release: 13%{?dist} +Version: 6.10.2 +Release: 1%{?dist} Summary: Glasgow Haskell Compilation system # fedora ghc has only been bootstrapped on the following archs: ExclusiveArch: %{ix86} x86_64 ppc alpha @@ -38,7 +38,6 @@ BuildRequires: gmp-devel, libedit-devel > 2.11-2 %if %{with 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 @@ -80,7 +79,6 @@ 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 @@ -218,6 +216,9 @@ fi %endif %changelog +* Wed Apr 08 2009 Bryan O'Sullivan - 6.10.2-1 +- Update to 6.10.2 + * Fri Feb 27 2009 Jens Petersen - 6.10.1-13 - ok let's stick with ExclusiveArch for brevity