[haskell-platform] haskell-platform-2014.1 snapshot

[Jens Petersen]

commit ac7d97bc0cc6ae2c15b3b8e88451c05cab8ec28b
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jun 4 19:07:59 2014 +0900

    haskell-platform-2014.1 snapshot

 .gitignore            |    1 +
 haskell-platform.spec |   52 +++++++++++++++++++++++++-----------------------
 sources               |    2 +-
 3 files changed, 29 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 364bb7f..4fc16b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ haskell-platform-2010.2.0.0.tar.gz
 /haskell-platform-2012.4.0.0-rc2.tar.gz
 /haskell-platform-2012.4.0.0.tar.gz
 /haskell-platform-2013.2.0.0.tar.gz
+/haskell-platform-2014.1.0.0.tar.gz
diff --git a/haskell-platform.spec b/haskell-platform.spec
index 69c163f..94be411 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -1,47 +1,47 @@
 # https://fedoraproject.org/wiki/Packaging:Haskell
 
-%global ghc_compiler_version 7.6.3
-%global alex_version 3.0.5
-%global cabal_install_version 1.16.0.2
-%global happy_version 1.18.10
+%global ghc_compiler_version 7.8.2
+%global alex_version 3.1.3
+%global cabal_install_version 1.18.0.4
+%global happy_version 1.19.3
 
 %global HUnit_version 1.2.5.2
-%global HTTP_version 4000.2.8
+%global HTTP_version 4000.2.10
 %global html_version 1.0.1.2
-%global mtl_version 2.1.2
-%global network_version 2.4.1.2
-%global parallel_version 3.2.0.3
-%global parsec_version 3.1.3
+%global mtl_version 2.1.3.1
+%global network_version 2.4.2.2
+%global parallel_version 3.2.0.4
+%global parsec_version 3.1.5
 %global QuickCheck_version 2.6
 %global random_version 1.0.1.1
 %global regex_base_version 0.93.2
 %global regex_compat_version 0.95.1
 %global regex_posix_version 0.95.2
 %global stm_version 2.4.2
-%global syb_version 0.4.0
-%global text_version 0.11.3.1
-%global transformers_version 0.3.0.0
+%global syb_version 0.4.1
+%global text_version 1.1.0.0
+%global xhtml_version 3000.2.1
 %global zlib_version 0.5.4.1
 # 2012.4
-%global async_version 2.0.1.4
-%global primitive_version 0.5.0.1
+%global async_version 2.0.1.5
+%global primitive_version 0.5.2.1
 %global split_version 0.2.2
-%global vector_version 0.10.0.1
+%global vector_version 0.10.9.1
 # 2013.2
 %global attoparsec_version 0.10.4.0
-%global case_insensitive_version 1.0.0.1
-%global hashable_version 1.1.2.5
-%global unordered_containers_version 0.2.3.0
+%global case_insensitive_version 1.1.0.3
+%global hashable_version 1.2.1.0
+%global unordered_containers_version 0.2.3.3
 
-%global separate_packages QuickCheck|HTTP|HUnit|alex|cabal-install|happy|html|mtl|network|parallel|parsec|random|regex-base|regex-compat|regex-posix|stm|syb|text|transformers|zlib|async|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers
+%global separate_packages QuickCheck|HTTP|HUnit|alex|cabal-install|happy|html|mtl|network|parallel|parsec|random|regex-base|regex-compat|regex-posix|stm|syb|text|zlib|async|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers|xhtml
 
 Name:           haskell-platform
-Version:        2013.2.0.0
+Version:        2014.1.0.0
 # Since library subpackages are versioned:
 # - 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:        36%{?dist}
+Release:        36.1%{?dist}
 Summary:        Standard Haskell distribution
 
 Group:          Development/Tools
@@ -81,8 +81,8 @@ BuildRequires:  ghc-syb-devel = %{syb_version}
 BuildRequires:  ghc-template-haskell-devel
 %endif
 BuildRequires:  ghc-text-devel = %{text_version}
-BuildRequires:  ghc-transformers-devel = %{transformers_version}
 BuildRequires:  ghc-time-devel
+BuildRequires:  ghc-xhtml-devel = %{xhtml_version}
 BuildRequires:  ghc-zlib-devel = %{zlib_version}
 # part of HP-2012.4
 BuildRequires:  ghc-async-devel = %{async_version}
@@ -120,8 +120,6 @@ and tools.  It provides a good starting environment for Haskell development.
 %ghc_lib_subpackage haskell-src 1.0.1.5
 %ghc_lib_subpackage OpenGL 2.8.0.0
 %ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw 1.3.0.0
-# exposed in ghc-7.8
-%ghc_lib_subpackage xhtml 3000.2.1
 %endif
 
 %global version %{haskell_platform_version}
@@ -149,7 +147,7 @@ Requires:       ghc-regex-posix-devel = %{regex_posix_version}
 Requires:       ghc-stm-devel = %{stm_version}
 Requires:       ghc-syb-devel = %{syb_version}
 Requires:       ghc-text-devel = %{text_version}
-Requires:       ghc-transformers-devel = %{transformers_version}
+Requires:       ghc-xhtml-devel = %{xhtml_version}
 Requires:       ghc-zlib-devel = %{zlib_version}
 # part of HP-2012.4
 Requires:       ghc-async-devel = %{async_version}
@@ -252,6 +250,10 @@ rm %{buildroot}/%{_docdir}/ghc-%{name}*/LICENSE
 
 
 %changelog
+* Wed Jun  4 2014 Jens Petersen <petersen at redhat.com> - 2014.1.0.0-36.1
+- update to haskell-platform-2014.1 snapshot
+- fedora ghc will ship xhtml
+
 * Mon Apr 21 2014 Jens Petersen <petersen at redhat.com> - 2013.2.0.0-36
 - fix build for versioned docdirs
 
diff --git a/sources b/sources
index 7955bcc..5b2a737 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36d02a889ad57a6345b167f5c7a6c164  haskell-platform-2013.2.0.0.tar.gz
+0370146a4f39368f9dbbd31498b5c83c  haskell-platform-2014.1.0.0.tar.gz