rpms/haddock/F-9 haddock-2.0.0.0-ghc683-process.patch, NONE, 1.1 haddock.spec, 1.11, 1.12

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/haddock/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11526

Modified Files:
	haddock.spec 
Added Files:
	haddock-2.0.0.0-ghc683-process.patch 
Log Message:
backport changes for ghc-6.8.3 from F10

haddock-2.0.0.0-ghc683-process.patch:

--- NEW FILE haddock-2.0.0.0-ghc683-process.patch ---
diff -up haddock-2.0.0.0/haddock.cabal~ haddock-2.0.0.0/haddock.cabal
--- haddock-2.0.0.0/haddock.cabal~	2008-01-08 04:35:53.000000000 +1000
+++ haddock-2.0.0.0/haddock.cabal	2008-06-26 13:13:35.000000000 +1000
@@ -20,7 +20,8 @@ build-depends:
   directory,
   pretty,
   containers,
-  array
+  array,
+  process
 extensions:           CPP, PatternGuards
 ghc-options:          -fglasgow-exts
 hs-source-dirs:       src
diff -up haddock-2.0.0.0/src/Haddock/GHC/Typecheck.hs~ haddock-2.0.0.0/src/Haddock/GHC/Typecheck.hs
--- haddock-2.0.0.0/src/Haddock/GHC/Typecheck.hs~	2008-01-08 04:35:53.000000000 +1000
+++ haddock-2.0.0.0/src/Haddock/GHC/Typecheck.hs	2008-06-26 14:48:40.000000000 +1000
@@ -23,6 +23,7 @@ import SrcLoc
 
 import Data.List
 
+import FastString
 
 type CheckedMod = (Module, FilePath, FullyCheckedMod)
 
@@ -69,7 +70,7 @@ mkGhcModule :: CheckedMod -> DynFlags ->
 mkGhcModule (mod, file, checkedMod) dynflags = GhcModule {
   ghcModule         = mod,
   ghcFilename       = file,
-  ghcMbDocOpts      = mbOpts,
+  ghcMbDocOpts      = fmap unpackFS mbOpts,
   ghcHaddockModInfo = info,
   ghcMbDoc          = mbDoc,
   ghcGroup          = group,
@@ -79,6 +80,6 @@ mkGhcModule (mod, file, checkedMod) dynf
   ghcInstances      = modInfoInstances modInfo
 }
   where
-    HsModule _ _ _ _ _ mbOpts _ _      = unLoc parsed
+    HsModule _ _ _ _ mbOpts _ _      = unLoc parsed
     (group, _, mbExports, mbDoc, info) = renamed
     (parsed, renamed, _, modInfo)      = checkedMod


Index: haddock.spec
===================================================================
RCS file: /cvs/extras/rpms/haddock/F-9/haddock.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- haddock.spec	19 Feb 2008 18:44:05 -0000	1.11
+++ haddock.spec	11 Nov 2008 06:44:30 -0000	1.12
@@ -1,9 +1,8 @@
-%define ghc_version 6.8.2
-%define ghcver ghc682
+%define ghc_version 6.8.3
 
 Name:           haddock
 Version:        2.0.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Haddock documentation tool for annotated Haskell source code
 
 Group:          Development/Tools
@@ -12,24 +11,12 @@
 Source0:        http://www.haskell.org/haddock/dist/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExcludeArch:	alpha ppc64
+# we have only bootstrapped ghc on the following archs:
+ExclusiveArch:	i386 x86_64 ppc
 
 BuildRequires:  ghc = %{ghc_version}
 BuildRequires:  coreutils libxslt docbook-style-xsl autoconf
-
-
-%package -n ghc-%{name}
-Summary:  Libraries for working with Haddock from Haskell code
-Group:    Development/Libraries
-Requires:  ghc = %{ghc_version}
-Requires: %{ghcver}-%{name} = %{version}-%{release}
-
-
-%package -n %{ghcver}-%{name}
-Summary:  Libraries for working with Haddock from Haskell code
-Group:    Development/Libraries
-Requires: %{ghcver}
-
+Patch1:		haddock-2.0.0.0-ghc683-process.patch
 
 %description
 Haddock is a tool for automatically generating hyperlinked documentation from
@@ -39,10 +26,14 @@
 Haddock lets you write documentation annotations next to the definitions of
 functions and types in the source code in a lightweight syntax.
 
-%description -n ghc-%{name}
-Libraries for working with Haddock from Haskell code.
 
-%description -n %{ghcver}-%{name}
+%package -n ghc-%{name}
+Summary:  Libraries for working with Haddock from Haskell code
+Group:    Development/Libraries
+Requires:  ghc = %{ghc_version}
+Obsoletes: ghc682-haddock < 2.0.0.0-3
+
+%description -n ghc-%{name}
 Libraries for working with Haddock from Haskell code.
 
 
@@ -53,6 +44,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-ghc683~
 
 
 %build
@@ -81,10 +73,6 @@
 
 %files -n ghc-%{name}
 %defattr(-,root,root)
-
-
-%files -n %{ghcver}-%{name}
-%defattr(-,root,root)
 %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
 
 
@@ -97,6 +85,11 @@
 
 
 %changelog
+* Thu Jun 26 2008 Jens Petersen <petersen at redhat.com> - 2.0.0.0-3.fc10
+- drop ghcver subpackage in line with ghc
+- obsolete ghc682-haddock
+- add haddock-2.0.0.0-ghc683-process.patch to fix build with ghc-6.8.3
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.0.0-2
 - Autorebuild for GCC 4.3