[haskell-platform] text is now separate package; drop separate_packages conditionals

[Jens Petersen]

commit 166e976034fb427cdc237a5bae7821a920457c10
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Jun 4 18:34:07 2013 +0900

    text is now separate package; drop separate_packages conditionals

 haskell-platform.spec |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/haskell-platform.spec b/haskell-platform.spec
index e5d049d..d4d19d2 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -5,6 +5,7 @@
 %global cabal_install_version 1.16.0.2
 %global happy_version 1.18.10
 
+%global text_version 0.11.3.1
 # 2012.4
 %global primitive_version 0.5.0.1
 %global split_version 0.2.2
@@ -15,7 +16,7 @@
 %global hashable_version 1.1.2.5
 %global unordered_containers_version 0.2.3.0
 
-#%%global separate_packages primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers
+%global separate_packages text|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers
 
 Name:           haskell-platform
 Version:        2013.2.0.0
@@ -55,7 +56,7 @@ BuildRequires:  ghc-time-devel
 BuildRequires:  ghc-bytestring-devel
 # zlib
 BuildRequires:  zlib-devel%{?_isa}
-%if %{defined separate_packages}
+BuildRequires:  ghc-text-devel = %{text_version}
 # part of HP-2012.4
 BuildRequires:  ghc-split-devel = %{split_version}
 BuildRequires:  ghc-primitive-devel = %{primitive_version}
@@ -110,15 +111,7 @@ and tools.  It provides a good starting environment for Haskell development.
 %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
-%if %{undefined separate_packages}
-%ghc_lib_subpackage primitive 0.5.0.1
-%ghc_lib_subpackage split 0.2.2
 %ghc_lib_subpackage vector 0.10.0.1
-%ghc_lib_subpackage attoparsec 0.10.4.0
-%ghc_lib_subpackage case-insensitive 1.0.0.1
-%ghc_lib_subpackage hashable 1.1.2.5
-%ghc_lib_subpackage unordered-containers 0.2.3.0
-%endif
 %endif
 
 %package -n alex
@@ -179,7 +172,7 @@ hand-written or generated by another program).
 %ghc_devel_package -m haskell-platform %{version}
 %{?ghc_packages_list:Requires: %(echo %{ghc_packages_list} | sed -e "s/\([^ ]*\)-\([^ ]*\)/ghc-\1-devel = \2-%{release},/g")}
 Requires:       ghc-libraries = %{ghc_compiler_version}
-%if %{defined separate_packages}
+Requires:       ghc-text-devel = %{text_version}
 # part of HP-2012.4
 Requires:       ghc-primitive-devel = %{primitive_version}
 Requires:       ghc-split-devel = %{split_version}
@@ -189,7 +182,6 @@ Requires:       ghc-attoparsec-devel = %{attoparsec_version}
 Requires:       ghc-case-insensitive-devel = %{case_insensitive_version}
 Requires:       ghc-hashable-devel = %{hashable_version}
 Requires:       ghc-unordered-containers-devel = %{unordered_containers_version}
-%endif
 # added in F17 devel cycle
 Obsoletes:      ghc-haskell-platform < %{version}-%{release}
 
@@ -351,6 +343,7 @@ mv %{buildroot}%{_datadir}/HUnit-*/* %{buildroot}%{_docdir}/ghc-HUnit-*/
 - new packages: GLURaw, OpenGLRaw
 - new depends: attoparsec, case-insensitive, hashable, unordered-containers
 - use ghc_fix_dynamic_rpath
+- text lib is separate package again
 
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012.4.0.0-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild