packages: ghc-haskell-platform/ghc-haskell-platform-ghc72.patch, ghc-haskel...

baggins baggins at pld-linux.org
Tue Sep 27 22:45:00 CEST 2011


Author: baggins                      Date: Tue Sep 27 20:45:00 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- builds with ghc 7.2

---- Files affected:
packages/ghc-haskell-platform:
   ghc-haskell-platform-ghc72.patch (1.1 -> 1.2) , ghc-haskell-platform.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/ghc-haskell-platform/ghc-haskell-platform-ghc72.patch
diff -u packages/ghc-haskell-platform/ghc-haskell-platform-ghc72.patch:1.1 packages/ghc-haskell-platform/ghc-haskell-platform-ghc72.patch:1.2
--- packages/ghc-haskell-platform/ghc-haskell-platform-ghc72.patch:1.1	Tue Sep 27 20:14:23 2011
+++ packages/ghc-haskell-platform/ghc-haskell-platform-ghc72.patch	Tue Sep 27 22:44:55 2011
@@ -30,3 +30,93 @@
    -- The dependency on Haskell 98 is only because
    -- Happy generates a parser that imports Array
    extensions:   CPP
+--- haskell-platform-2011.2.0.1/packages/text-0.11.0.6/text.cabal~	2011-04-03 23:24:18.000000000 +0200
++++ haskell-platform-2011.2.0.1/packages/text-0.11.0.6/text.cabal	2011-09-27 20:25:42.296965245 +0200
+@@ -120,6 +120,7 @@
+     build-depends:
+       ghc-prim, base >= 4, deepseq >= 1.1.0.0
+     cpp-options: -DHAVE_DEEPSEQ
++    extensions: BangPatterns
+   else
+     build-depends: extensible-exceptions
+     extensions: PatternSignatures
+--- haskell-platform-2011.2.0.1/packages/fgl-5.4.2.3/fgl.cabal~	2011-04-03 23:23:53.000000000 +0200
++++ haskell-platform-2011.2.0.1/packages/fgl-5.4.2.3/fgl.cabal	2011-09-27 21:22:47.148188662 +0200
+@@ -38,5 +38,5 @@
+ 	Data.Graph.Inductive.Query.TransClos,
+ 	Data.Graph.Inductive
+ build-depends:	base < 5, mtl, containers, array
+-extensions: MultiParamTypeClasses, OverlappingInstances, FlexibleInstances, ScopedTypeVariables
++extensions: MultiParamTypeClasses, OverlappingInstances, FlexibleInstances, ScopedTypeVariables, BangPatterns
+ build-type: Simple
+--- haskell-platform-2011.2.0.1/packages/cabal-install-0.10.2/cabal-install.cabal.orig	2011-04-03 23:24:22.000000000 +0200
++++ haskell-platform-2011.2.0.1/packages/cabal-install-0.10.2/cabal-install.cabal	2011-09-27 21:53:05.311604026 +0200
+@@ -93,33 +93,24 @@
+         Paths_cabal_install
+ 
+     build-depends: base     >= 2        && < 5,
+-                   Cabal    >= 1.10.1   && < 1.11,
++                   Cabal    >= 1.10.1   && < 1.13,
+                    filepath >= 1.0      && < 1.3,
+                    network  >= 1        && < 3,
+                    HTTP     >= 4000.0.2 && < 4001,
+                    zlib     >= 0.4      && < 0.6,
+-                   time     >= 1.1      && < 1.3
+-
+-    if flag(old-base)
+-      build-depends: base < 3
+-    else
+-      build-depends: base       >= 3,
+-                     process    >= 1   && < 1.1,
+-                     directory  >= 1   && < 1.2,
+-                     pretty     >= 1   && < 1.1,
+-                     random     >= 1   && < 1.1,
+-                     containers >= 0.1 && < 0.5,
+-                     array      >= 0.1 && < 0.4,
+-                     old-time   >= 1   && < 1.1
+-
+-    if flag(bytestring-in-base)
+-      build-depends: base >= 2.0 && < 2.2
+-    else
+-      build-depends: base < 2.0 || >= 3.0, bytestring >= 0.9
++                   time     >= 1.1      && < 1.3,
++                   process    >= 1   && < 1.2,
++                   directory  >= 1   && < 1.2,
++                   pretty     >= 1   && < 1.2,
++                   random     >= 1   && < 1.1,
++                   containers >= 0.1 && < 0.5,
++                   array      >= 0.1 && < 0.4,
++                   old-time   >= 1   && < 1.1,
++                   bytestring >= 0.9
+ 
+     if os(windows)
+       build-depends: Win32 >= 2 && < 3
+       cpp-options: -DWIN32
+     else
+-      build-depends: unix >= 1.0 && < 2.5
++      build-depends: unix >= 1.0 && < 2.6
+     extensions: CPP
+--- haskell-platform-2011.2.0.1/packages/haskell-platform-2011.2.0.1/haskell-platform.cabal.orig	2011-04-03 23:24:26.000000000 +0200
++++ haskell-platform-2011.2.0.1/packages/haskell-platform-2011.2.0.1/haskell-platform.cabal	2011-09-27 22:10:03.918772545 +0200
+@@ -59,7 +59,7 @@
+     haskell-src                 ==1.0.1.4,
+     html                        ==1.0.1.2,
+     HUnit                       ==1.2.2.3,
+-    network                     ==2.3.0.2,
++    network                     ==2.3.0.5,
+     OpenGL                      ==2.2.3.0,
+     parallel                    ==3.1.0.1,
+     parsec                      ==3.1.1,
+@@ -68,10 +68,10 @@
+     regex-compat                ==0.93.1,
+     regex-posix                 ==0.94.4,
+     stm                         ==2.2.0.1,
+-    syb                         ==0.3,
++    syb                         ==0.3.3,
+     xhtml                       ==3000.2.0.1,
+     zlib                        ==0.5.3.1,
+-    HTTP                        ==4000.1.1,
++    HTTP                        ==4000.1.2,
+     deepseq                     ==1.1.0.2,
+ 
+     -- 2011.1 proposals:

================================================================
Index: packages/ghc-haskell-platform/ghc-haskell-platform.spec
diff -u packages/ghc-haskell-platform/ghc-haskell-platform.spec:1.15 packages/ghc-haskell-platform/ghc-haskell-platform.spec:1.16
--- packages/ghc-haskell-platform/ghc-haskell-platform.spec:1.15	Tue Sep 27 20:23:03 2011
+++ packages/ghc-haskell-platform/ghc-haskell-platform.spec	Tue Sep 27 22:44:55 2011
@@ -3,7 +3,7 @@
 Summary:	Comprehensive, robust development environment for programming in Haskell
 Name:		ghc-%{pkgname}
 Version:	2011.2.0.1
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Languages
 #Source0:	http://hackage.haskell.org/platform/%{version}/%{pkgname}-%{version}.tar.gz
@@ -12,6 +12,10 @@
 # TEMP
 Source100:	http://hackage.haskell.org/packages/archive/syb/0.3.3/syb-0.3.3.tar.gz
 # Source100-md5:	4bc2ef44a86c9182f9768c6cc0a96c3a
+Source101:	http://hackage.haskell.org/packages/archive/HTTP/4000.1.2/HTTP-4000.1.2.tar.gz
+# Source101-md5:	0871666457aeabe4ed8ebce0acb424b7
+Source102:	http://hackage.haskell.org/packages/archive/network/2.3.0.5/network-2.3.0.5.tar.gz
+# Source102-md5:	716fbe9e01059582503d2920d2618ef3
 Patch0:		%{name}-install.patch
 Patch1:		%{name}-ghc72.patch
 URL:		http://hackage.haskell.org/platform/
@@ -20,6 +24,8 @@
 BuildRequires:	OpenGL-glut-devel
 BuildRequires:	ghc >= 6.12.3
 BuildRequires:	ghc-prof
+BuildRequires:	ghc-random
+BuildRequires:	ghc-random-prof
 BuildRequires:	zlib-devel
 BuildRequires:	rpmbuild(macros) >= 1.608
 %requires_eq	ghc
@@ -42,6 +48,9 @@
 Provides:	ghc-regex-compat
 Provides:	ghc-regex-posix
 Provides:	ghc-stm
+Provides:	ghc-syb
+Provides:	ghc-text
+Provides:	ghc-transformers
 Provides:	ghc-xhtml
 Provides:	ghc-zlib
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -69,13 +78,15 @@
 They should be installed when GHC's profiling subsystem is needed.
 
 %prep
-%setup -q -n %{pkgname}-%{version} -a100
+%setup -q -n %{pkgname}-%{version} -a100 -a101 -a102
 %patch0 -p1
 %patch1 -p1
 
-%{__rm} -r packages/syb-0.3
-mv syb-0.3.3 packages/
-%{__sed} -i -e 's|syb-0.3|syb-0.3.3|g' packages/platform.packages
+%{__rm} -r packages/syb-0.3 packages/HTTP-4000.1.1 packages/network-2.3.0.2
+mv syb-0.3.3 HTTP-4000.1.2 network-2.3.0.5 packages/
+%{__sed} -i -e 's|syb-0.3|syb-0.3.3|g' \
+	-e 's|HTTP-4000.1.1|HTTP-4000.1.2|g' \
+	-e 's|network-2.3.0.2|network-2.3.0.5|g' packages/platform.packages
 
 %build
 
@@ -224,6 +235,11 @@
 %dir %{_libdir}/%{ghcdir}/parsec-*/Text
 %dir %{_libdir}/%{ghcdir}/parsec-*/Text/ParserCombinators
 %dir %{_libdir}/%{ghcdir}/parsec-*/Text/ParserCombinators/Parsec
+%dir %{_libdir}/%{ghcdir}/parsec-*/Text/Parsec
+%dir %{_libdir}/%{ghcdir}/parsec-*/Text/Parsec/ByteString
+%{_libdir}/%{ghcdir}/parsec-*/Text/*.hi
+%{_libdir}/%{ghcdir}/parsec-*/Text/Parsec/*.hi
+%{_libdir}/%{ghcdir}/parsec-*/Text/Parsec/ByteString/*.hi
 %{_libdir}/%{ghcdir}/parsec-*/Text/ParserCombinators/Parsec/*.hi
 %{_libdir}/%{ghcdir}/parsec-*/Text/ParserCombinators/*.hi
 %{_libdir}/%{ghcdir}/parsec-*/libHSparsec-*.a
@@ -234,7 +250,9 @@
 %dir %{_libdir}/%{ghcdir}/network-*/include/HsNetworkConfig.h
 %dir %{_libdir}/%{ghcdir}/network-*/Network
 %dir %{_libdir}/%{ghcdir}/network-*/Network/Socket
+%dir %{_libdir}/%{ghcdir}/network-*/Network/Socket/ByteString
 %{_libdir}/%{ghcdir}/network-*/Network/Socket/*.hi
+%{_libdir}/%{ghcdir}/network-*/Network/Socket/ByteString/*.hi
 %{_libdir}/%{ghcdir}/network-*/Network/*.hi
 %{_libdir}/%{ghcdir}/network-*/*.hi
 %{_libdir}/%{ghcdir}/network-*/libHSnetwork-*.a
@@ -311,85 +329,155 @@
 %{_libdir}/%{ghcdir}/zlib-*/HSzlib-*.o
 %exclude %{_libdir}/%{ghcdir}/*/*_p.a
 %{_libdir}/%{ghcdir}/package.conf.d/*.conf
+%dir %{_libdir}/%{ghcdir}/syb-*
+%dir %{_libdir}/%{ghcdir}/syb-*/Data
+%dir %{_libdir}/%{ghcdir}/syb-*/Data/Generics
+%dir %{_libdir}/%{ghcdir}/syb-*/Generics
+%dir %{_libdir}/%{ghcdir}/syb-*/Generics/SYB
+%{_libdir}/%{ghcdir}/syb-*/Data/*.hi
+%{_libdir}/%{ghcdir}/syb-*/Data/Generics/*.hi
+%{_libdir}/%{ghcdir}/syb-*/Generics/*.hi
+%{_libdir}/%{ghcdir}/syb-*/Generics/SYB/*.hi
+%{_libdir}/%{ghcdir}/syb-*/HSsyb-*.o
+%{_libdir}/%{ghcdir}/syb-*/libHSsyb-*.a
+%dir %{_libdir}/%{ghcdir}/text-*
+%dir %{_libdir}/%{ghcdir}/text-*/Data
+%dir %{_libdir}/%{ghcdir}/text-*/Data/Text
+%dir %{_libdir}/%{ghcdir}/text-*/Data/Text/Encoding
+%dir %{_libdir}/%{ghcdir}/text-*/Data/Text/Encoding/Fusion
+%dir %{_libdir}/%{ghcdir}/text-*/Data/Text/Fusion
+%dir %{_libdir}/%{ghcdir}/text-*/Data/Text/IO
+%dir %{_libdir}/%{ghcdir}/text-*/Data/Text/Lazy
+%dir %{_libdir}/%{ghcdir}/text-*/Data/Text/Lazy/Encoding
+%{_libdir}/%{ghcdir}/text-*/Data/*.hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/*.hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/Encoding/*.hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/Encoding/Fusion/*.hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/Fusion/*.hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/IO/*.hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/Lazy/*.hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/Lazy/Encoding/*.hi
+%{_libdir}/%{ghcdir}/text-*/HStext-*.o
+%{_libdir}/%{ghcdir}/text-*/libHStext-*.a
+%dir %{_libdir}/%{ghcdir}/transformers-*
+%dir %{_libdir}/%{ghcdir}/transformers-*/Control
+%dir %{_libdir}/%{ghcdir}/transformers-*/Control/Monad
+%dir %{_libdir}/%{ghcdir}/transformers-*/Control/Monad/IO
+%dir %{_libdir}/%{ghcdir}/transformers-*/Control/Monad/Trans
+%dir %{_libdir}/%{ghcdir}/transformers-*/Control/Monad/Trans/RWS
+%dir %{_libdir}/%{ghcdir}/transformers-*/Control/Monad/Trans/State
+%dir %{_libdir}/%{ghcdir}/transformers-*/Control/Monad/Trans/Writer
+%dir %{_libdir}/%{ghcdir}/transformers-*/Data
+%dir %{_libdir}/%{ghcdir}/transformers-*/Data/Functor
+%{_libdir}/%{ghcdir}/transformers-*/Control/Monad/IO/*.hi
+%{_libdir}/%{ghcdir}/transformers-*/Control/Monad/Trans/*.hi
+%{_libdir}/%{ghcdir}/transformers-*/Control/Monad/Trans/RWS/*.hi
+%{_libdir}/%{ghcdir}/transformers-*/Control/Monad/Trans/State/*.hi
+%{_libdir}/%{ghcdir}/transformers-*/Control/Monad/Trans/Writer/*.hi
+%{_libdir}/%{ghcdir}/transformers-*/Data/Functor/*.hi
+%{_libdir}/%{ghcdir}/transformers-*/HStransformers-*.o
+%{_libdir}/%{ghcdir}/transformers-*/libHStransformers-*.a
 
 %files prof
 %defattr(644,root,root,755)
+%{_libdir}/%{ghcdir}/cgi-*/libHScgi-*_p.a
+%{_libdir}/%{ghcdir}/cgi-*/Network/CGI/*.p_hi
+%{_libdir}/%{ghcdir}/cgi-*/Network/*.p_hi
+%{_libdir}/%{ghcdir}/deepseq-*/Control/*.p_hi
+%{_libdir}/%{ghcdir}/deepseq-*/libHSdeepseq-*_p.a
+%{_libdir}/%{ghcdir}/fgl-*/Data/Graph/Inductive/Internal/*.p_hi
+%{_libdir}/%{ghcdir}/fgl-*/Data/Graph/Inductive/Monad/*.p_hi
+%{_libdir}/%{ghcdir}/fgl-*/Data/Graph/Inductive/*.p_hi
+%{_libdir}/%{ghcdir}/fgl-*/Data/Graph/Inductive/Query/*.p_hi
+%{_libdir}/%{ghcdir}/fgl-*/Data/Graph/*.p_hi
+%{_libdir}/%{ghcdir}/fgl-*/libHSfgl-*_p.a
+%{_libdir}/%{ghcdir}/GLUT-*/Graphics/UI/GLUT/Callbacks/*.p_hi
+%{_libdir}/%{ghcdir}/GLUT-*/Graphics/UI/GLUT/*.p_hi
+%{_libdir}/%{ghcdir}/GLUT-*/Graphics/UI/*.p_hi
+%{_libdir}/%{ghcdir}/GLUT-*/libHSGLUT-*_p.a
+%{_libdir}/%{ghcdir}/haskell-src-*/Language/Haskell/*.p_hi
+%{_libdir}/%{ghcdir}/haskell-src-*/libHShaskell-src-*_p.a
+%{_libdir}/%{ghcdir}/html-*/libHShtml-*_p.a
+%{_libdir}/%{ghcdir}/html-*/Text/Html/*.p_hi
+%{_libdir}/%{ghcdir}/html-*/Text/*.p_hi
+%{_libdir}/%{ghcdir}/HTTP-*/libHSHTTP-*_p.a
+%{_libdir}/%{ghcdir}/HTTP-*/Network/HTTP/*.p_hi
+%{_libdir}/%{ghcdir}/HTTP-*/Network/*.p_hi
+%{_libdir}/%{ghcdir}/HUnit-*/libHSHUnit-*_p.a
+%{_libdir}/%{ghcdir}/HUnit-*/Test/HUnit/*.p_hi
+%{_libdir}/%{ghcdir}/HUnit-*/Test/*.p_hi
 %{_libdir}/%{ghcdir}/mtl-*/Control/Monad/Cont/*.p_hi
 %{_libdir}/%{ghcdir}/mtl-*/Control/Monad/Error/*.p_hi
-%{_libdir}/%{ghcdir}/mtl-*/Control/Monad/RWS/*.p_hi
+%{_libdir}/%{ghcdir}/mtl-*/Control/Monad/*.p_hi
 %{_libdir}/%{ghcdir}/mtl-*/Control/Monad/Reader/*.p_hi
+%{_libdir}/%{ghcdir}/mtl-*/Control/Monad/RWS/*.p_hi
 %{_libdir}/%{ghcdir}/mtl-*/Control/Monad/State/*.p_hi
 %{_libdir}/%{ghcdir}/mtl-*/Control/Monad/Writer/*.p_hi
-%{_libdir}/%{ghcdir}/mtl-*/Control/Monad/*.p_hi
 %{_libdir}/%{ghcdir}/mtl-*/libHSmtl-*_p.a
-%{_libdir}/%{ghcdir}/HUnit-*/Test/HUnit/*.p_hi
-%{_libdir}/%{ghcdir}/HUnit-*/Test/*.p_hi
-%{_libdir}/%{ghcdir}/HUnit-*/libHSHUnit-*_p.a
+%{_libdir}/%{ghcdir}/network-*/libHSnetwork-*_p.a
+%{_libdir}/%{ghcdir}/network-*/Network/*.p_hi
+%{_libdir}/%{ghcdir}/network-*/Network/Socket/ByteString/*.p_hi
+%{_libdir}/%{ghcdir}/network-*/Network/Socket/*.p_hi
+%{_libdir}/%{ghcdir}/network-*/*.p_hi
+%{_libdir}/%{ghcdir}/OpenGL-*/Graphics/Rendering/OpenGL/GL/*.p_hi
 %{_libdir}/%{ghcdir}/OpenGL-*/Graphics/Rendering/OpenGL/GL/PixelRectangles/*.p_hi
 %{_libdir}/%{ghcdir}/OpenGL-*/Graphics/Rendering/OpenGL/GL/Texturing/*.p_hi
-%{_libdir}/%{ghcdir}/OpenGL-*/Graphics/Rendering/OpenGL/GL/*.p_hi
 %{_libdir}/%{ghcdir}/OpenGL-*/Graphics/Rendering/OpenGL/GLU/*.p_hi
 %{_libdir}/%{ghcdir}/OpenGL-*/Graphics/Rendering/OpenGL/*.p_hi
 %{_libdir}/%{ghcdir}/OpenGL-*/Graphics/Rendering/*.p_hi
 %{_libdir}/%{ghcdir}/OpenGL-*/libHSOpenGL-*_p.a
-%{_libdir}/%{ghcdir}/GLUT-*/Graphics/UI/GLUT/Callbacks/*.p_hi
-%{_libdir}/%{ghcdir}/GLUT-*/Graphics/UI/GLUT/*.p_hi
-%{_libdir}/%{ghcdir}/GLUT-*/Graphics/UI/*.p_hi
-%{_libdir}/%{ghcdir}/deepseq-*/Control/*.p_hi
-%{_libdir}/%{ghcdir}/deepseq-*/libHSdeepseq-*_p.a
-%{_libdir}/%{ghcdir}/haskell-src-*/Language/Haskell/*.p_hi
-%{_libdir}/%{ghcdir}/haskell-src-*/libHShaskell-src-*_p.a
-%{_libdir}/%{ghcdir}/html-*/Text/Html/*.p_hi
-%{_libdir}/%{ghcdir}/html-*/Text/*.p_hi
-%{_libdir}/%{ghcdir}/html-*/libHShtml-*_p.a
-%{_libdir}/%{ghcdir}/QuickCheck-*/Test/QuickCheck/*.p_hi
-%{_libdir}/%{ghcdir}/QuickCheck-*/Test/*.p_hi
-%{_libdir}/%{ghcdir}/QuickCheck-*/libHSQuickCheck-*_p.a
-%{_libdir}/%{ghcdir}/fgl-*/Data/Graph/Inductive/Internal/*.p_hi
-%{_libdir}/%{ghcdir}/fgl-*/Data/Graph/Inductive/Monad/*.p_hi
-%{_libdir}/%{ghcdir}/fgl-*/Data/Graph/Inductive/Query/*.p_hi
-%{_libdir}/%{ghcdir}/fgl-*/Data/Graph/Inductive/*.p_hi
-%{_libdir}/%{ghcdir}/fgl-*/Data/Graph/*.p_hi
-%{_libdir}/%{ghcdir}/fgl-*/libHSfgl-*_p.a
 %{_libdir}/%{ghcdir}/parallel-*/Control/Parallel/*.p_hi
 %{_libdir}/%{ghcdir}/parallel-*/Control/*.p_hi
 %{_libdir}/%{ghcdir}/parallel-*/libHSparallel-*_p.a
-%{_libdir}/%{ghcdir}/GLUT-*/libHSGLUT-*_p.a
+%{_libdir}/%{ghcdir}/parsec-*/libHSparsec-*_p.a
+%{_libdir}/%{ghcdir}/parsec-*/Text/Parsec/ByteString/*.p_hi
+%{_libdir}/%{ghcdir}/parsec-*/Text/Parsec/*.p_hi
 %{_libdir}/%{ghcdir}/parsec-*/Text/ParserCombinators/Parsec/*.p_hi
 %{_libdir}/%{ghcdir}/parsec-*/Text/ParserCombinators/*.p_hi
-%{_libdir}/%{ghcdir}/parsec-*/libHSparsec-*_p.a
-%{_libdir}/%{ghcdir}/network-*/Network/Socket/*.p_hi
-%{_libdir}/%{ghcdir}/network-*/Network/*.p_hi
-%{_libdir}/%{ghcdir}/network-*/*.p_hi
-%{_libdir}/%{ghcdir}/network-*/libHSnetwork-*_p.a
-%{_libdir}/%{ghcdir}/HTTP-*/Network/HTTP/*.p_hi
-%{_libdir}/%{ghcdir}/HTTP-*/Network/*.p_hi
-%{_libdir}/%{ghcdir}/HTTP-*/libHSHTTP-*_p.a
+%{_libdir}/%{ghcdir}/parsec-*/Text/*.p_hi
+%{_libdir}/%{ghcdir}/QuickCheck-*/libHSQuickCheck-*_p.a
+%{_libdir}/%{ghcdir}/QuickCheck-*/Test/*.p_hi
+%{_libdir}/%{ghcdir}/QuickCheck-*/Test/QuickCheck/*.p_hi
+%{_libdir}/%{ghcdir}/regex-base-*/libHSregex-base-*_p.a
 %{_libdir}/%{ghcdir}/regex-base-*/Text/Regex/Base/*.p_hi
 %{_libdir}/%{ghcdir}/regex-base-*/Text/Regex/*.p_hi
-%{_libdir}/%{ghcdir}/regex-base-*/libHSregex-base-*_p.a
+%{_libdir}/%{ghcdir}/regex-compat-*/libHSregex-compat-*_p.a
+%{_libdir}/%{ghcdir}/regex-compat-*/Text/*.p_hi
+%{_libdir}/%{ghcdir}/regex-posix-*/libHSregex-posix-*_p.a
+%{_libdir}/%{ghcdir}/regex-posix-*/Text/Regex/*.p_hi
 %{_libdir}/%{ghcdir}/regex-posix-*/Text/Regex/Posix/ByteString/*.p_hi
 %{_libdir}/%{ghcdir}/regex-posix-*/Text/Regex/Posix/*.p_hi
-%{_libdir}/%{ghcdir}/regex-posix-*/Text/Regex/*.p_hi
-%{_libdir}/%{ghcdir}/regex-posix-*/libHSregex-posix-*_p.a
-%{_libdir}/%{ghcdir}/regex-compat-*/Text/*.p_hi
-%{_libdir}/%{ghcdir}/regex-compat-*/libHSregex-compat-*_p.a
-%{_libdir}/%{ghcdir}/stm-*/Control/Concurrent/STM/*.p_hi
 %{_libdir}/%{ghcdir}/stm-*/Control/Concurrent/*.p_hi
+%{_libdir}/%{ghcdir}/stm-*/Control/Concurrent/STM/*.p_hi
 %{_libdir}/%{ghcdir}/stm-*/Control/Monad/*.p_hi
 %{_libdir}/%{ghcdir}/stm-*/Control/Sequential/*.p_hi
 %{_libdir}/%{ghcdir}/stm-*/libHSstm-*_p.a
-%{_libdir}/%{ghcdir}/xhtml-*/Text/XHtml/Strict/*.p_hi
+%{_libdir}/%{ghcdir}/syb-*/Data/Generics/*.p_hi
+%{_libdir}/%{ghcdir}/syb-*/Data/*.p_hi
+%{_libdir}/%{ghcdir}/syb-*/Generics/*.p_hi
+%{_libdir}/%{ghcdir}/syb-*/Generics/SYB/*.p_hi
+%{_libdir}/%{ghcdir}/text-*/Data/*.p_hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/Encoding/Fusion/*.p_hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/Encoding/*.p_hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/Fusion/*.p_hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/IO/*.p_hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/Lazy/Encoding/*.p_hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/Lazy/*.p_hi
+%{_libdir}/%{ghcdir}/text-*/Data/Text/*.p_hi
+%{_libdir}/%{ghcdir}/transformers-*/Control/Monad/IO/*.p_hi
+%{_libdir}/%{ghcdir}/transformers-*/Control/Monad/Trans/*.p_hi
+%{_libdir}/%{ghcdir}/transformers-*/Control/Monad/Trans/RWS/*.p_hi
+%{_libdir}/%{ghcdir}/transformers-*/Control/Monad/Trans/State/*.p_hi
+%{_libdir}/%{ghcdir}/transformers-*/Control/Monad/Trans/Writer/*.p_hi
+%{_libdir}/%{ghcdir}/transformers-*/Data/Functor/*.p_hi
+%{_libdir}/%{ghcdir}/xhtml-*/libHSxhtml-*_p.a
+%{_libdir}/%{ghcdir}/xhtml-*/Text/*.p_hi
 %{_libdir}/%{ghcdir}/xhtml-*/Text/XHtml/Frameset/*.p_hi
-%{_libdir}/%{ghcdir}/xhtml-*/Text/XHtml/Transitional/*.p_hi
 %{_libdir}/%{ghcdir}/xhtml-*/Text/XHtml/*.p_hi
-%{_libdir}/%{ghcdir}/xhtml-*/Text/*.p_hi
-%{_libdir}/%{ghcdir}/xhtml-*/libHSxhtml-*_p.a
-%{_libdir}/%{ghcdir}/cgi-*/Network/CGI/*.p_hi
-%{_libdir}/%{ghcdir}/cgi-*/Network/*.p_hi
-%{_libdir}/%{ghcdir}/cgi-*/libHScgi-*_p.a
-%{_libdir}/%{ghcdir}/zlib-*/Codec/Compression/Zlib/*.p_hi
+%{_libdir}/%{ghcdir}/xhtml-*/Text/XHtml/Strict/*.p_hi
+%{_libdir}/%{ghcdir}/xhtml-*/Text/XHtml/Transitional/*.p_hi
 %{_libdir}/%{ghcdir}/zlib-*/Codec/Compression/*.p_hi
+%{_libdir}/%{ghcdir}/zlib-*/Codec/Compression/Zlib/*.p_hi
 %{_libdir}/%{ghcdir}/zlib-*/libHSzlib-*_p.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -398,6 +486,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2011/09/27 20:44:55  baggins
+- rel 2
+- builds with ghc 7.2
+
 Revision 1.15  2011/09/27 18:23:03  baggins
 - too much debug
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-haskell-platform/ghc-haskell-platform-ghc72.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-haskell-platform/ghc-haskell-platform.spec?r1=1.15&r2=1.16&f=u



More information about the pld-cvs-commit mailing list