[haskell-platform] mtl and zlib are separate packages again

[Jens Petersen]

commit 55278ab3e90581936ffcb6be06ecf86641273151
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Dec 4 18:08:25 2013 +1000

    mtl and zlib are separate packages again

 haskell-platform.spec |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/haskell-platform.spec b/haskell-platform.spec
index 981de72..2488d55 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -5,9 +5,11 @@
 %global cabal_install_version 1.16.0.2
 %global happy_version 1.18.10
 
+%global mtl_version 2.1.2
 %global random_version 1.0.1.1
 %global stm_version 2.4.2
 %global text_version 0.11.3.1
+%global zlib_version 0.5.4.1
 # 2012.4
 %global primitive_version 0.5.0.1
 %global split_version 0.2.2
@@ -18,7 +20,7 @@
 %global hashable_version 1.1.2.5
 %global unordered_containers_version 0.2.3.0
 
-%global separate_packages random|stm|text|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers
+%global separate_packages mtl|random|stm|text|zlib|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers
 
 Name:           haskell-platform
 Version:        2013.2.0.0
@@ -26,7 +28,7 @@ Version:        2013.2.0.0
 # - release can only be reset if all library versions get bumped simultaneously
 #   (eg for a major release)
 # - minor release numbers should be incremented monotonically
-Release:        26%{?dist}
+Release:        27%{?dist}
 Summary:        Standard Haskell distribution
 
 Group:          Development/Tools
@@ -57,10 +59,11 @@ BuildRequires:  ghc-time-devel
 # regex-base, text
 BuildRequires:  ghc-bytestring-devel
 # zlib
-BuildRequires:  zlib-devel%{?_isa}
+BuildRequires:  ghc-mtl-devel = %{mtl_version}
 BuildRequires:  ghc-random-devel = %{random_version}
 BuildRequires:  ghc-stm-devel = %{stm_version}
 BuildRequires:  ghc-text-devel = %{text_version}
+BuildRequires:  ghc-zlib-devel = %{zlib_version}
 # part of HP-2012.4
 BuildRequires:  ghc-split-devel = %{split_version}
 BuildRequires:  ghc-primitive-devel = %{primitive_version}
@@ -97,7 +100,6 @@ and tools.  It provides a good starting environment for Haskell development.
 %ghc_lib_subpackage html 1.0.1.2
 %ghc_lib_subpackage HTTP 4000.2.8
 %ghc_lib_subpackage HUnit 1.2.5.2
-%ghc_lib_subpackage mtl 2.1.2
 %ghc_lib_subpackage network 2.4.1.2
 %ghc_lib_subpackage OpenGL 2.8.0.0
 %ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw 1.3.0.0
@@ -110,7 +112,6 @@ and tools.  It provides a good starting environment for Haskell development.
 %ghc_lib_subpackage syb 0.4.0
 %ghc_lib_subpackage transformers 0.3.0.0
 %ghc_lib_subpackage xhtml 3000.2.1
-%ghc_lib_subpackage -c zlib-devel%{?_isa} zlib 0.5.4.1
 %endif
 
 %package -n alex
@@ -174,9 +175,11 @@ Requires(post): ghc-compiler = %{ghc_version}
 Requires(postun): ghc-compiler = %{ghc_version}
 %{?ghc_packages_list:Requires: %(echo %{ghc_packages_list} | sed -e "s/\([^ ]*\)-\([^ ]*\)/ghc-\1-devel = \2-%{release},/g")}
 Requires:       ghc-libraries = %{ghc_compiler_version}
+Requires:       ghc-mtl-devel = %{mtl_version}
 Requires:       ghc-random-devel = %{random_version}
 Requires:       ghc-stm-devel = %{stm_version}
 Requires:       ghc-text-devel = %{text_version}
+Requires:       ghc-zlib-devel = %{zlib_version}
 # part of HP-2012.4
 Requires:       ghc-primitive-devel = %{primitive_version}
 Requires:       ghc-split-devel = %{split_version}
@@ -345,6 +348,9 @@ mv %{buildroot}%{_datadir}/HUnit-*/* %{buildroot}%{_docdir}/ghc-HUnit/
 
 
 %changelog
+* Wed Dec  4 2013 Jens Petersen <petersen at redhat.com> - 2013.2.0.0-27
+- mtl and zlib are now separate packages again
+
 * Thu Oct 31 2013 Jens Petersen <petersen at redhat.com> - 2013.2.0.0-26
 - fix alex patching for ppc and s390 archs