[haskell-platform] vector was patched to build on all archs, so HP should build everywhere too now
Jens Petersen
petersen at fedoraproject.org
Thu Dec 6 07:08:41 UTC 2012
commit 02fde4f47d4692c40f30836c1723607d6670563a
Author: Jens Petersen <petersen at redhat.com>
Date: Thu Dec 6 14:17:23 2012 +0900
vector was patched to build on all archs, so HP should build everywhere too now
haskell-platform.spec | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/haskell-platform.spec b/haskell-platform.spec
index 11b475f..97f05d9 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -16,7 +16,7 @@ Version: 2012.4.0.0
# - release can only be reset if all library versions get bumped simultaneously
# (eg for a major release)
# - minor release numbers should be incremented monotonically
-Release: 20%{?dist}
+Release: 21%{?dist}
Summary: Standard Haskell distribution
Group: Development/Tools
@@ -53,9 +53,7 @@ BuildRequires: zlib-devel%{?_isa}
# part of HP-2012.4
BuildRequires: ghc-split-devel = %{split_version}
BuildRequires: ghc-primitive-devel = %{primitive_version}
-%ifarch %{ghc_arches_with_ghci}
BuildRequires: ghc-vector-devel = %{vector_version}
-%endif
# ghci "ghc" library is not officially part of hackage-platform
Requires: ghc-compiler = %{ghc_compiler_version}
Requires: alex = %{alex_version}-%{release}
@@ -158,7 +156,6 @@ hand-written or generated by another program).
%global version %{haskell_platform_version}
-%ifarch %{ghc_arches_with_ghci}
%ghc_devel_package -m haskell-platform %{version}
%{?ghc_packages_list:Requires: %(echo %{ghc_packages_list} | sed -e "s/\([^ ]*\)-\([^ ]*\)/ghc-\1-devel = \2-%{release},/g")}
Requires: ghc-libraries = %{ghc_compiler_version}
@@ -172,7 +169,6 @@ Obsoletes: ghc-haskell-platform < %{version}-%{release}
%ghc_devel_description haskell-platform
Haskell Platform is a suite of stable and well used Haskell libraries
and tools. It provides a good starting environment for Haskell development.
-%endif
%prep
@@ -211,11 +207,9 @@ GLUT)
./Setup register --inplace
;;
haskell-platform)
-%ifarch %{ghc_arches_with_ghci}
cabal_configure_extra_options="--with-cabal-install=../cabal-install-%{cabal_install_version}/dist/build/cabal/cabal --with-happy=../happy-%{happy_version}/dist/build/happy/happy --with-alex=../alex-%{alex_version}/dist/build/alex/alex"
%ghc_lib_build_without_haddock $name $ver
cabal_configure_extra_options=
-%endif
;;
*)
%ghc_lib_build $name $ver
@@ -295,9 +289,14 @@ done
%ghc_devel_post_postun haskell-platform
-%ifarch %{ghc_arches_with_ghci}
%files
%doc packages/%{name}-%{version}/LICENSE
+
+
+# protect for koji
+%if %{defined ghc_devel_files}
+%files -n ghc-haskell-platform-devel -f ghc-haskell-platform-devel.files
+%doc packages/haskell-platform-%{version}/LICENSE
%endif
@@ -320,13 +319,6 @@ done
%{_sysconfdir}/profile.d/cabal-install.sh
-# protect for koji
-%if %{defined ghc_devel_files}
-%files -n ghc-haskell-platform-devel -f ghc-haskell-platform-devel.files
-%doc packages/haskell-platform-%{version}/LICENSE
-%endif
-
-
%files -n happy
%doc packages/happy-%{happy_version}/ANNOUNCE
%doc packages/happy-%{happy_version}/CHANGES
@@ -339,6 +331,9 @@ done
%changelog
+* Thu Dec 6 2012 Jens Petersen <petersen at redhat.com> - 2012.4.0.0-21
+- vector was patched to build on all archs (#883479)
+
* Wed Dec 5 2012 Jens Petersen <petersen at redhat.com> - 2012.4.0.0-20
- keep split, vector, and primitive in their own existing src packages
- allow building on ghc archs without ghci: ie without vector library (#883479)
More information about the scm-commits
mailing list