[haskell-platform] Revert to 2013.2.0.0 until ghc-7.8Revert "haskell-platform-2014.1 snapshot"
Jens Petersen
petersen at fedoraproject.org
Tue Jul 8 10:50:26 UTC 2014
commit 7c9b3819bb052f7aedab040626c31f69583e982e
Author: Jens Petersen <petersen at redhat.com>
Date: Tue Jul 8 19:49:50 2014 +0900
Revert to 2013.2.0.0 until ghc-7.8Revert "haskell-platform-2014.1 snapshot"
Reverting "HP-2014.2 includes hscolour"
Reverting "cgi dropped"
Reverting "tweak build-tools"
Reverting "more build fixes"
Reverting "more build tweaks"
Reverting "opt out of f21 mass rebuild due to changes staged for ghc78"
Reverting "fixes for new upstream buildsystem"
Reverting "haskell-platform-2014.1 snapshot"
.gitignore | 1 -
LICENSE | 30 --------
haskell-platform-2014.1.0.0-buildtools.patch | 12 ---
haskell-platform.spec | 93 +++++++++++++-------------
sources | 2 +-
5 files changed, 47 insertions(+), 91 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4fc16b5..364bb7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,3 @@ haskell-platform-2010.2.0.0.tar.gz
/haskell-platform-2012.4.0.0-rc2.tar.gz
/haskell-platform-2012.4.0.0.tar.gz
/haskell-platform-2013.2.0.0.tar.gz
-/haskell-platform-2014.1.0.0.tar.gz
diff --git a/haskell-platform.spec b/haskell-platform.spec
index e3847c6..69c163f 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -1,57 +1,53 @@
# https://fedoraproject.org/wiki/Packaging:Haskell
-%global ghc_compiler_version 7.8.2
-%global alex_version 3.1.3
-%global cabal_install_version 1.18.0.4
-%global happy_version 1.19.3
+%global ghc_compiler_version 7.6.3
+%global alex_version 3.0.5
+%global cabal_install_version 1.16.0.2
+%global happy_version 1.18.10
%global HUnit_version 1.2.5.2
-%global HTTP_version 4000.2.10
+%global HTTP_version 4000.2.8
%global html_version 1.0.1.2
-%global mtl_version 2.1.3.1
-%global network_version 2.4.2.2
-%global parallel_version 3.2.0.4
-%global parsec_version 3.1.5
+%global mtl_version 2.1.2
+%global network_version 2.4.1.2
+%global parallel_version 3.2.0.3
+%global parsec_version 3.1.3
%global QuickCheck_version 2.6
%global random_version 1.0.1.1
%global regex_base_version 0.93.2
%global regex_compat_version 0.95.1
%global regex_posix_version 0.95.2
%global stm_version 2.4.2
-%global syb_version 0.4.1
-%global text_version 1.1.0.0
-%global xhtml_version 3000.2.1
+%global syb_version 0.4.0
+%global text_version 0.11.3.1
+%global transformers_version 0.3.0.0
%global zlib_version 0.5.4.1
# 2012.4
-%global async_version 2.0.1.5
-%global primitive_version 0.5.2.1
+%global async_version 2.0.1.4
+%global primitive_version 0.5.0.1
%global split_version 0.2.2
-%global vector_version 0.10.9.1
+%global vector_version 0.10.0.1
# 2013.2
%global attoparsec_version 0.10.4.0
-%global case_insensitive_version 1.1.0.3
-%global hashable_version 1.2.1.0
-%global unordered_containers_version 0.2.3.3
-# 2014.2
-%global hscolour_version 1.20.3
+%global case_insensitive_version 1.0.0.1
+%global hashable_version 1.1.2.5
+%global unordered_containers_version 0.2.3.0
-%global separate_packages QuickCheck|HTTP|HUnit|alex|cabal-install|happy|html|mtl|network|parallel|parsec|random|regex-base|regex-compat|regex-posix|stm|syb|text|zlib|async|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers|xhtml|hscolour
+%global separate_packages QuickCheck|HTTP|HUnit|alex|cabal-install|happy|html|mtl|network|parallel|parsec|random|regex-base|regex-compat|regex-posix|stm|syb|text|transformers|zlib|async|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers
Name: haskell-platform
-Version: 2014.1.0.0
+Version: 2013.2.0.0
# Since library subpackages are versioned:
# - 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: 36.1%{?dist}
+Release: 36%{?dist}
Summary: Standard Haskell distribution
Group: Development/Tools
License: BSD
URL: http://hackage.haskell.org/platform
Source0: http://lambda.haskell.org/platform/download/%{version}/%{name}-%{version}.tar.gz
-Source1: LICENSE
-Patch1: haskell-platform-2014.1.0.0-buildtools.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra
@@ -85,8 +81,8 @@ BuildRequires: ghc-syb-devel = %{syb_version}
BuildRequires: ghc-template-haskell-devel
%endif
BuildRequires: ghc-text-devel = %{text_version}
+BuildRequires: ghc-transformers-devel = %{transformers_version}
BuildRequires: ghc-time-devel
-BuildRequires: ghc-xhtml-devel = %{xhtml_version}
BuildRequires: ghc-zlib-devel = %{zlib_version}
# part of HP-2012.4
BuildRequires: ghc-async-devel = %{async_version}
@@ -98,9 +94,6 @@ BuildRequires: ghc-attoparsec-devel = %{attoparsec_version}
BuildRequires: ghc-case-insensitive-devel = %{case_insensitive_version}
BuildRequires: ghc-hashable-devel = %{hashable_version}
BuildRequires: ghc-unordered-containers-devel = %{unordered_containers_version}
-# part of HP-2014.2
-BuildRequires: ghc-hscolour-devel = %{hscolour_version}
-BuildRequires: hscolour = %{hscolour_version}
# ghci "ghc" library is not officially part of hackage-platform
Requires: ghc-compiler = %{ghc_compiler_version}
@@ -108,7 +101,6 @@ Requires: alex = %{alex_version}
Requires: cabal-install = %{cabal_install_version}
Requires: happy = %{happy_version}
Requires: ghc-haskell-platform-devel = %{version}-%{release}
-Requires: hscolour = %{hscolour_version}
%description
Haskell Platform is a suite of stable and well used Haskell libraries
@@ -120,6 +112,7 @@ and tools. It provides a good starting environment for Haskell development.
%global haskell_platform_version %{version}
%if %{defined ghclibdir}
+%ghc_lib_subpackage cgi 3001.1.7.5
%ghc_lib_subpackage fgl 5.4.2.4
%ghc_lib_subpackage -c mesa-libGLU-devel%{?_isa} GLURaw 1.3.0.0
%ghc_lib_subpackage -c freeglut-devel%{?_isa} GLUT 2.4.0.0
@@ -127,6 +120,8 @@ and tools. It provides a good starting environment for Haskell development.
%ghc_lib_subpackage haskell-src 1.0.1.5
%ghc_lib_subpackage OpenGL 2.8.0.0
%ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw 1.3.0.0
+# exposed in ghc-7.8
+%ghc_lib_subpackage xhtml 3000.2.1
%endif
%global version %{haskell_platform_version}
@@ -154,7 +149,7 @@ Requires: ghc-regex-posix-devel = %{regex_posix_version}
Requires: ghc-stm-devel = %{stm_version}
Requires: ghc-syb-devel = %{syb_version}
Requires: ghc-text-devel = %{text_version}
-Requires: ghc-xhtml-devel = %{xhtml_version}
+Requires: ghc-transformers-devel = %{transformers_version}
Requires: ghc-zlib-devel = %{zlib_version}
# part of HP-2012.4
Requires: ghc-async-devel = %{async_version}
@@ -166,8 +161,6 @@ Requires: ghc-attoparsec-devel = %{attoparsec_version}
Requires: ghc-case-insensitive-devel = %{case_insensitive_version}
Requires: ghc-hashable-devel = %{hashable_version}
Requires: ghc-unordered-containers-devel = %{unordered_containers_version}
-# part of HP-2014.2
-Requires: ghc-hscolour-devel = %{hscolour_version}
# added in F17 devel cycle
Obsoletes: ghc-haskell-platform < %{version}-%{release}
@@ -177,25 +170,29 @@ This provides the haskell-platform meta library package.
%prep
%setup -q -n %{name}-%{version}
-%patch1 -p1 -b .orig
-# hack for h-p.cabal in top dir
-mkdir packages/%{name}-%{version}
-cp %SOURCE1 hptool/Setup.hs packages/%{name}-%{version}
-mv %{name}.cabal packages/%{name}-%{version}
+cd packages
+
+cd ..
%build
HOME=$PWD
+PATH=$HOME/.cabal/bin:$PATH
%define cabal_configure_options --user
+
cd packages
-for i in $(egrep -v "^(%{?separate_packages})-" ../etc/build.packages) %{name}-%{version}; do
+for i in $(egrep -v "^(%{?separate_packages})-" platform.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
@@ -204,21 +201,29 @@ haskell-platform)
esac
cd ..
done
-cd ..
%install
HOME=$PWD
+PATH=$HOME/.cabal/bin:$PATH
cd packages
-for i in $(egrep -v "^(%{?separate_packages})-" ../etc/build.packages) %{name}-%{version}; do
+
+for i in $(egrep -v "^(%{?separate_packages})-" platform.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
@@ -247,12 +252,6 @@ rm %{buildroot}/%{_docdir}/ghc-%{name}*/LICENSE
%changelog
-* Wed Jun 4 2014 Jens Petersen <petersen at redhat.com> - 2014.1.0.0-36.1
-- update to haskell-platform-2014.1 snapshot
-- fedora ghc will ship xhtml
-- cgi dropped
-- add hscolour as a requirement
-
* Mon Apr 21 2014 Jens Petersen <petersen at redhat.com> - 2013.2.0.0-36
- fix build for versioned docdirs
diff --git a/sources b/sources
index 5b2a737..7955bcc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0370146a4f39368f9dbbd31498b5c83c haskell-platform-2014.1.0.0.tar.gz
+36d02a889ad57a6345b167f5c7a6c164 haskell-platform-2013.2.0.0.tar.gz
More information about the scm-commits
mailing list