[haskell-platform] build with ghc_lib_build and without_haddock
Jens Petersen
petersen at fedoraproject.org
Sat Jan 22 16:40:44 UTC 2011
commit 7f75868812b1ef0478f2789a95b0ef36628eacf2
Author: Jens Petersen <petersen at redhat.com>
Date: Sun Jan 23 02:40:34 2011 +1000
build with ghc_lib_build and without_haddock
haskell-platform.spec | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/haskell-platform.spec b/haskell-platform.spec
index acc6ccb..4e46702 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -5,8 +5,7 @@
%global common_description The Haskell Platform is a blessed library and tool suite for Haskell\
distilled from Hackage.
-%bcond_without shared
-%bcond_without hscolour
+%define without_haddock 1
%global upstream_version 2011.1.0.0
@@ -55,7 +54,6 @@ Group: Development/Tools
License: BSD
URL: http://hackage.haskell.org/platform
Source0: http://hackage.haskell.org/platform/%{upstream_version}/cabal/%{name}-%{upstream_version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha
BuildRequires: ghc, ghc-prof
@@ -114,8 +112,7 @@ This package contains profiling libraries.
%build
-%cabal_configure --ghc -p
-%cabal build
+%ghc_lib_build
%install
@@ -161,6 +158,7 @@ fi
%changelog
* Sat Jan 22 2011 Jens Petersen <petersen at redhat.com> - 2011.1.0.0-0.3
- make ghc-haskell-platform-devel require ghc-devel and ghc_devel_requires
+- build with ghc_lib_build and without_haddock
* Tue Jan 18 2011 Jens Petersen <petersen at redhat.com> - 2011.1.0.0-0.2
- update to cabal2spec-0.22.4
More information about the scm-commits
mailing list