diff --git a/haskell-platform.spec b/haskell-platform.spec
index c134a9a..3ef67ae 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -35,16 +35,11 @@
 %global xhtml_version 3000.2.1
 %global zlib_version 0.5.4.2
 # new in HP 7.10.2
-%global tf_random_version 0.5,
-%global old_locale_version 1.0.0.7,
-%global old_time_version 1.1.0.3,
-%global network_uri_version 2.6.0.3,
-%global exceptions_version 0.8.0.2,
-%global transformers_compat_version 0.4.0.4,
-%global multipart 0.1.2,
-%global scientific 0.3.3.8,
-%global ObjectName 1.1.0.0,
-%global StateVar 1.1.0.0
+%global exceptions_version 0.8.0.2
+%global network_uri_version 2.6.0.3
+%global scientific_version 0.3.3.8
+%global tf_random_version 0.5
+%global transformers_compat_version 0.4.0.4
 
 %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|hscolour|tf-random|exceptions|transformers-compat|scientific|network-uri
 
@@ -71,11 +66,17 @@ BuildRequires:  ghc-compiler = %{ghc_compiler_version}
 # GLUT
 BuildRequires:  freeglut-devel%{?_isa}
 BuildRequires:  happy = %{happy_version}
+BuildRequires:  hscolour = %{hscolour_version}
 # OpenGL
 BuildRequires:  mesa-libGL-devel%{?_isa},mesa-libGLU-devel%{?_isa}
+BuildRequires:  ghc-async-devel = %{async_version}
+BuildRequires:  ghc-attoparsec-devel = %{attoparsec_version}
 BuildRequires:  ghc-bytestring-devel
+BuildRequires:  ghc-case-insensitive-devel = %{case_insensitive_version}
 BuildRequires:  ghc-deepseq-devel
+BuildRequires:  ghc-hashable-devel = %{hashable_version}
 BuildRequires:  ghc-haskell98-devel
+BuildRequires:  ghc-hscolour-devel = %{hscolour_version}
 BuildRequires:  ghc-HUnit-devel = %{HUnit_version}
 BuildRequires:  ghc-HTTP-devel = %{HTTP_version}
 BuildRequires:  ghc-html-devel = %{html_version}
@@ -83,33 +84,29 @@ BuildRequires:  ghc-mtl-devel = %{mtl_version}
 BuildRequires:  ghc-network-devel = %{network_version}
 BuildRequires:  ghc-parallel-devel = %{parallel_version}
 BuildRequires:  ghc-parsec-devel = %{parsec_version}
+BuildRequires:  ghc-primitive-devel = %{primitive_version}
 BuildRequires:  ghc-QuickCheck-devel = %{QuickCheck_version}
 BuildRequires:  ghc-random-devel = %{random_version}
 BuildRequires:  ghc-regex-base-devel = %{regex_base_version}
 BuildRequires:  ghc-regex-compat-devel = %{regex_compat_version}
 BuildRequires:  ghc-regex-posix-devel = %{regex_posix_version}
+BuildRequires:  ghc-split-devel = %{split_version}
 BuildRequires:  ghc-stm-devel = %{stm_version}
 BuildRequires:  ghc-syb-devel = %{syb_version}
-%ifarch %{ghc_arches_with_ghci}
 BuildRequires:  ghc-template-haskell-devel
-%endif
 BuildRequires:  ghc-text-devel = %{text_version}
 BuildRequires:  ghc-time-devel
+BuildRequires:  ghc-unordered-containers-devel = %{unordered_containers_version}
+BuildRequires:  ghc-vector-devel = %{vector_version}
 BuildRequires:  ghc-xhtml-devel = %{xhtml_version}
 BuildRequires:  ghc-zlib-devel = %{zlib_version}
-# part of HP-2012.4
-BuildRequires:  ghc-async-devel = %{async_version}
-BuildRequires:  ghc-primitive-devel = %{primitive_version}
-BuildRequires:  ghc-split-devel = %{split_version}
-BuildRequires:  ghc-vector-devel = %{vector_version}
-# part of HP-2013.2
-BuildRequires:  ghc-attoparsec-devel = %{attoparsec_version}
-BuildRequires:  ghc-case-insensitive-devel = %{case_insensitive_version}
-BuildRequires:  ghc-hashable-devel = %{hashable_version}
-BuildRequires:  ghc-unordered-containers-devel = %{unordered_containers_version}
-# part of HP-2014.2
-BuildRequires:  ghc-hscolour-devel = %{hscolour_version}
-BuildRequires:  hscolour = %{hscolour_version}
+# new in HP 7.10.2
+BuildRequires:  ghc-exceptions-devel = %{exceptions_version}
+BuildRequires:  ghc-network-uri-devel = %{network_uri_version}
+BuildRequires:  ghc-scientific-devel = %{scientific_version}
+BuildRequires:  ghc-tf-random-devel = %{tf_random_version}
+BuildRequires:  ghc-transformers-compat-devel = %{transformers_compat_version}
+
 
 # ghci "ghc" library is not officially part of hackage-platform
 Requires:       ghc-compiler = %{ghc_compiler_version}
@@ -136,10 +133,10 @@ and tools.  It provides a good starting environment for Haskell development.
 %ghc_lib_subpackage haskell-src 1.0.2.0
 %ghc_lib_subpackage OpenGL 2.12.0.1
 %ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw 2.5.1.0
-%ghc_lib_subpackage old_locale_version 1.0.0.7,
-%ghc_lib_subpackage old_time_version 1.1.0.3,
-%ghc_lib_subpackage multipart 0.1.2,
-%ghc_lib_subpackage ObjectName 1.1.0.0,
+%ghc_lib_subpackage old-locale 1.0.0.7
+%ghc_lib_subpackage old-time 1.1.0.3
+%ghc_lib_subpackage multipart 0.1.2
+%ghc_lib_subpackage ObjectName 1.1.0.0
 %ghc_lib_subpackage StateVar 1.1.0.0
 %endif