petersen pushed to haskell-platform (epel7). "more build fixes"

[notifications at fedoraproject.org]

From 58abd73e3adf95598e17b6a7ada3a21627f942d2 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen at redhat.com>
Date: Fri, 6 Jun 2014 18:27:16 +0900
Subject: more build fixes


diff --git a/haskell-platform.spec b/haskell-platform.spec
index 2026ab4..9b3bc2d 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -169,17 +169,14 @@ This provides the haskell-platform meta library package.
 
 %prep
 %setup -q -n %{name}-%{version}
-cp -p %SOURCE1 hptool/Setup.hs .
 
 # hack for h-p.cabal in top dir
-ln -s .. packages/%{name}-%{version}
-
-mkdir bin
-ln -s %{_bindir}/cabal bin/cabal-install
+mkdir packages/%{name}-%{version}
+cp %SOURCE1 hptool/Setup.hs packages/%{name}-%{version}
+mv %{name}.cabal packages/%{name}-%{version}
 
 %build
 HOME=$PWD
-PATH=$PATH:$PWD/bin
 %define cabal_configure_options --user
 cd packages
 for i in $(egrep -v "^(%{?separate_packages})-" ../etc/build.packages) %{name}-%{version}; do
@@ -190,8 +187,11 @@ case $name in
 haskell-platform)
 %ghc_lib_build_without_haddock $name $ver
 ;;
+*)
 %ghc_lib_build $name $ver
 ./Setup register --inplace
+;;
+esac
 cd ..
 done
 cd ..
@@ -199,7 +199,6 @@ cd ..
 
 %install
 HOME=$PWD
-PATH=$PATH:$PWD/bin
 
 cd packages
 for i in $(egrep -v "^(%{?separate_packages})-" ../etc/build.packages) %{name}-%{version}; do
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/haskell-platform.git/commit/?h=epel7&id=58abd73e3adf95598e17b6a7ada3a21627f942d2