From e7f8aa5fe4e84f1fee89d3733e4c82fe93e7f3d6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sep 07 2016 08:19:52 +0000 Subject: remove *GL* from haskell-platform.cabal too --- diff --git a/haskell-platform-armv7-disable-GL.patch b/haskell-platform-armv7-disable-GL.patch new file mode 100644 index 0000000..c9c4048 --- /dev/null +++ b/haskell-platform-armv7-disable-GL.patch @@ -0,0 +1,22 @@ +--- haskell-platform-7.10.3/haskell-platform.cabal~ 2016-09-07 17:08:17.374172950 +0900 ++++ haskell-platform-7.10.3/haskell-platform.cabal 2016-09-07 17:10:19.813641804 +0900 +@@ -66,8 +66,6 @@ + case-insensitive ==1.2.0.5, + cgi ==3001.2.2.2, + fgl ==5.5.2.3, +- GLUT ==2.7.0.3, +- GLURaw ==1.5.0.2, + haskell-src ==1.0.2.0, + hashable ==1.2.3.3, + html ==1.0.1.2, +@@ -75,8 +73,6 @@ + HUnit ==1.3.0.0, + mtl ==2.2.1, + network ==2.6.2.1, +- OpenGL ==2.13.1.0, +- OpenGLRaw ==2.6.0.0, + parallel ==3.2.0.6, + parsec ==3.1.9, + primitive ==0.6.1.0, + +Diff finished. Wed Sep 7 17:10:25 2016 diff --git a/haskell-platform.spec b/haskell-platform.spec index cb3f55b..2117c76 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -63,6 +63,7 @@ URL: http://www.haskell.org/platform/ Source0: http://www.haskell.org/platform/download/%{version}/%{name}-%{upstream_version}.tar.gz Patch1: haskell-platform-build-tools-cabal-install.patch Patch2: haskell-platform-7.10.3-version.patch +Patch3: haskell-platform-armv7-disable-GL.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra >= 1.6.4 @@ -202,10 +203,13 @@ This provides the haskell-platform meta library package. %prep -%setup -q -c -n %{name}-%{upstream_version} +%setup -q -c -n %{name}-%{version} cd %{name}-%{upstream_version} %patch1 -p1 -b .orig %patch2 -p1 +%ifarch armv7hl +%patch3 -p1 +%endif # hack for h-p.cabal in top dir mkdir packages/%{name}-%{version}