petersen pushed to haskell-platform (f20). "fixes for new upstream buildsystem"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu May 21 09:01:48 UTC 2015
From 6614c979585111f7c02b88aa99b8fb580fbe2629 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen at redhat.com>
Date: Thu, 5 Jun 2014 00:17:06 +0900
Subject: fixes for new upstream buildsystem
diff --git a/haskell-platform.spec b/haskell-platform.spec
index 94be411..fd6a53e 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -180,25 +180,16 @@ PATH=$HOME/.cabal/bin:$PATH
%define cabal_configure_options --user
cd packages
-for i in $(egrep -v "^(%{?separate_packages})-" platform.packages); do
+for i in $(egrep -v "^(%{?separate_packages})-" ../etc/build.packages); do
name=$(echo $i | sed -e "s/\(.*\)-.*/\1/")
ver=$(echo $i | sed -e "s/.*-\(.*\)/\1/")
cd $name-$ver
-case $name in
-alex|cabal-install|happy)
-%ghc_bin_build
-;;
-haskell-platform)
-%ghc_lib_build_without_haddock $name $ver
-cabal_configure_extra_options=
-;;
-*)
%ghc_lib_build $name $ver
./Setup register --inplace
-;;
-esac
cd ..
done
+cd ..
+%ghc_lib_build haskell-platform %{version}
%install
@@ -206,27 +197,20 @@ HOME=$PWD
PATH=$HOME/.cabal/bin:$PATH
cd packages
-
-for i in $(egrep -v "^(%{?separate_packages})-" platform.packages); do
+for i in $(egrep -v "^(%{?separate_packages})-" ../etc/build.packages); do
name=$(echo $i | sed -e "s/\(.*\)-.*/\1/")
ver=$(echo $i | sed -e "s/.*-\(.*\)/\1/")
cd $name-$ver
-case $name in
-alex|cabal-install|happy)
-%ghc_bin_install $name $ver
-;;
-*)
%ghc_lib_install $name $ver
# for ghc-7.8
#%%ghc_gen_filelists $name $ver
echo "%doc packages/$name-$ver/LICENSE" >> ghc-$name.files
-;;
-esac
cd ..
done
mv */*.files ..
cd ..
+%ghc_lib_install
%ghc_strip_dynlinked
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/haskell-platform.git/commit/?h=f20&id=6614c979585111f7c02b88aa99b8fb580fbe2629
More information about the scm-commits
mailing list