diff --git a/haskell-platform.spec b/haskell-platform.spec index 141bb09..cb3f55b 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -44,6 +44,10 @@ %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|old-locale|old-time +%ifarch armv7hl +%global separate_packages %{separate_packages}|OpenGL|OpenGLRaw|GLUT|GLURaw +%endif + Name: haskell-platform Version: 2016.%{upstream_version} # Since library subpackages are versioned: @@ -132,14 +136,17 @@ and tools. It provides a good starting environment for Haskell development. %if %{defined ghclibdir} %ghc_lib_subpackage cgi-3001.2.2.2 %ghc_lib_subpackage fgl-5.5.2.3 +# OpenGLRaw-2.6.0.0 started failing: +%ifnarch armv7hl %ghc_lib_subpackage -c mesa-libGLU-devel%{?_isa} GLURaw-1.5.0.2 %ghc_lib_subpackage -c freeglut-devel%{?_isa} GLUT-2.7.0.3 +%ghc_lib_subpackage OpenGL-2.13.1.0 +%ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw-2.6.0.0 +%endif %ghc_lib_subpackage half-0.2.2.1 %ghc_lib_subpackage haskell-src-1.0.2.0 %ghc_lib_subpackage multipart-0.1.2 %ghc_lib_subpackage ObjectName-1.1.0.0 -%ghc_lib_subpackage OpenGL-2.13.1.0 -%ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw-2.6.0.0 %ghc_lib_subpackage StateVar-1.1.0.1 %endif @@ -259,6 +266,7 @@ mv %{buildroot}%{_datadir}/licenses/ghc-haskell-platform{,-devel} * Fri Jul 29 2016 Jens Petersen - 2016.7.10.3-2 - split-0.2.3.1 - use new ghc_libs_build and ghc_libs_install macros +- disable GL packages for armv7hl (#1372527) * Thu Jun 23 2016 Jens Petersen - 2016.7.10.3-1 - update to new haskell-platform version 7.10.3