diff --git a/haskell-platform.spec b/haskell-platform.spec index 8a71a10..5700d05 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 HUnit_version 1.2.5.2 %global html_version 1.0.1.2 %global mtl_version 2.1.2 %global parsec_version 3.1.3 @@ -25,7 +26,7 @@ %global hashable_version 1.1.2.5 %global unordered_containers_version 0.2.3.0 -%global separate_packages html|mtl|parsec|random|regex-base|regex-posix|stm|text|zlib|async|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers +%global separate_packages HUnit|html|mtl|parsec|random|regex-base|regex-posix|stm|text|zlib|async|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers Name: haskell-platform Version: 2013.2.0.0 @@ -33,7 +34,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: 30%{?dist} +Release: 31%{?dist} Summary: Standard Haskell distribution Group: Development/Tools @@ -55,6 +56,7 @@ BuildRequires: mesa-libGL-devel%{?_isa},mesa-libGLU-devel%{?_isa} BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-haskell98-devel +BuildRequires: ghc-HUnit-devel = %{HUnit_version} BuildRequires: ghc-html-devel = %{html_version} BuildRequires: ghc-mtl-devel = %{mtl_version} BuildRequires: ghc-parsec-devel = %{parsec_version} @@ -102,7 +104,6 @@ and tools. It provides a good starting environment for Haskell development. %ghc_lib_subpackage -c freeglut-devel%{?_isa} GLUT 2.4.0.0 %ghc_lib_subpackage haskell-src 1.0.1.5 %ghc_lib_subpackage HTTP 4000.2.8 -%ghc_lib_subpackage HUnit 1.2.5.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 @@ -177,6 +178,7 @@ Requires(postun): ghc-compiler = %{ghc_version} # pull in all of ghc for least surprise # even though libghc is not formally part of HP Requires: ghc = %{ghc_compiler_version} +Requires: ghc-HUnit-devel = %{HUnit_version} Requires: ghc-html-devel = %{html_version} Requires: ghc-mtl-devel = %{mtl_version} Requires: ghc-parsec-devel = %{parsec_version} @@ -360,6 +362,9 @@ mv %{buildroot}%{_datadir}/HUnit-*/* %{buildroot}%{_docdir}/ghc-HUnit/ %changelog +* Fri Mar 14 2014 Jens Petersen - 2013.2.0.0-31 +- HUnit is a separate package again + * Thu Feb 6 2014 Jens Petersen - only show cabal-install upgrade notice for verbose