[haskell-platform] update to 2013.2.0.0 RC
Jens Petersen
petersen at fedoraproject.org
Mon May 13 02:45:52 UTC 2013
commit 82c1f53bdaf0ede47dcf432239baa2bbbb184284
Author: Jens Petersen <petersen at redhat.com>
Date: Mon May 13 11:45:44 2013 +0900
update to 2013.2.0.0 RC
ghc-GLUT-extralibs.patch | 8 ---
haskell-platform.spec | 143 ++++++++++++++++++++++++++--------------------
2 files changed, 82 insertions(+), 69 deletions(-)
---
diff --git a/haskell-platform.spec b/haskell-platform.spec
index 5677bea..3fd314b 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -1,33 +1,39 @@
# https://fedoraproject.org/wiki/Packaging:Haskell
-# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
-%global ghc_compiler_version 7.4.2
-%global alex_version 3.0.2
-%global cabal_install_version 0.14.0
+%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
+# 2012.4
%global primitive_version 0.5.0.1
-%global split_version 0.2.1.1
+%global split_version 0.2.2
%global vector_version 0.10.0.1
+# 2013.2
+%global attoparsec_version 0.10.4.0
+%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 primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers
Name: haskell-platform
-Version: 2012.4.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: 22%{?dist}
+Release: 22.1%{?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
-Patch1: ghc-GLUT-extralibs.patch
+Source0: http://lambda.haskell.org/platform/download/%{version}/%{name}-%{version}-rc1.tar.gz
Patch2: alex-ghc74-fix-bang-pattern.patch
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros >= 0.95.2
+BuildRequires: ghc-rpm-macros-extra
# for fixing RPATH in the binary programs
BuildRequires: chrpath
BuildRequires: ghc-compiler = %{ghc_compiler_version}
@@ -36,7 +42,6 @@ BuildRequires: freeglut-devel%{?_isa}
# OpenGL
BuildRequires: mesa-libGL-devel%{?_isa},mesa-libGLU-devel%{?_isa}
# QuickCheck
-BuildRequires: ghc-extensible-exceptions-devel
%ifarch %{ghc_arches_with_ghci}
BuildRequires: ghc-template-haskell-devel
%endif
@@ -50,10 +55,18 @@ BuildRequires: ghc-time-devel
BuildRequires: ghc-bytestring-devel
# zlib
BuildRequires: zlib-devel%{?_isa}
+%if %{defined separate_packages}
# part of HP-2012.4
BuildRequires: ghc-split-devel = %{split_version}
BuildRequires: ghc-primitive-devel = %{primitive_version}
BuildRequires: ghc-vector-devel = %{vector_version}
+# part of HP-2013.2
+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}
+%endif
+
# ghci "ghc" library is not officially part of hackage-platform
Requires: ghc-compiler = %{ghc_compiler_version}
Requires: alex = %{alex_version}-%{release}
@@ -70,35 +83,42 @@ and tools. It provides a good starting environment for Haskell development.
%global haskell_platform_version %{version}
-# follows order of platform.packages
%if %{defined ghclibdir}
-%ghc_lib_subpackage HUnit 1.2.5.1
-%ghc_lib_subpackage -c mesa-libGL-devel%{?_isa},mesa-libGLU-devel%{?_isa} OpenGL 2.2.3.1
-%ghc_lib_subpackage -c freeglut-devel%{?_isa} GLUT 2.1.2.1
-%ghc_lib_subpackage html 1.0.1.2
-%ghc_lib_subpackage parallel 3.2.0.3
-%ghc_lib_subpackage -l %BSDHaskellReport random 1.0.1.1
-%ghc_lib_subpackage QuickCheck 2.5.1.1
-# alex
-%ghc_lib_subpackage stm 2.4
-%ghc_lib_subpackage async 2.0.1.3
-%ghc_lib_subpackage syb 0.3.7
+%ghc_lib_subpackage async 2.0.1.4
+%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
%ghc_lib_subpackage haskell-src 1.0.1.5
-%ghc_lib_subpackage text 0.11.2.3
-%ghc_lib_subpackage transformers 0.3.0.0
+%ghc_lib_subpackage html 1.0.1.2
+%ghc_lib_subpackage HTTP 4000.2.8
+%ghc_lib_subpackage HUnit 1.2.5.2
%ghc_lib_subpackage mtl 2.1.2
-%ghc_lib_subpackage fgl 5.4.2.4
-# happy
+%ghc_lib_subpackage network 2.4.1.2
+%ghc_lib_subpackage OpenGL 2.8.0.0
+%ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw 1.3.0.0
+%ghc_lib_subpackage parallel 3.2.0.3
%ghc_lib_subpackage parsec 3.1.3
-%ghc_lib_subpackage network 2.3.1.0
-%ghc_lib_subpackage HTTP 4000.2.5
+%ghc_lib_subpackage QuickCheck 2.6
+%ghc_lib_subpackage -l %BSDHaskellReport random 1.0.1.1
%ghc_lib_subpackage regex-base 0.93.2
-%ghc_lib_subpackage regex-posix 0.95.2
%ghc_lib_subpackage regex-compat 0.95.1
+%ghc_lib_subpackage regex-posix 0.95.2
+%ghc_lib_subpackage stm 2.4.2
+%ghc_lib_subpackage syb 0.4.0
+%ghc_lib_subpackage text 0.11.3.1
+%ghc_lib_subpackage transformers 0.3.0.0
%ghc_lib_subpackage xhtml 3000.2.1
-%ghc_lib_subpackage cgi 3001.1.7.4
-%ghc_lib_subpackage -c zlib-devel%{?_isa} zlib 0.5.4.0
-# cabal-install
+%ghc_lib_subpackage -c zlib-devel%{?_isa} zlib 0.5.4.1
+%if %{undefined separate_packages}
+%ghc_lib_subpackage primitive 0.5.0.1
+%ghc_lib_subpackage split 0.2.2
+%ghc_lib_subpackage vector 0.10.0.1
+%ghc_lib_subpackage attoparsec 0.10.4.0
+%ghc_lib_subpackage case-insensitive 1.0.0.1
+%ghc_lib_subpackage hashable 1.1.2.5
+%ghc_lib_subpackage unordered-containers 0.2.3.0
+%endif
%endif
%package -n alex
@@ -159,10 +179,17 @@ hand-written or generated by another program).
%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}
+%if %{defined separate_packages}
# part of HP-2012.4
Requires: ghc-primitive-devel = %{primitive_version}
Requires: ghc-split-devel = %{split_version}
Requires: ghc-vector-devel = %{vector_version}
+# part of HP-2013.2
+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}
+%endif
# added in F17 devel cycle
Obsoletes: ghc-haskell-platform < %{version}-%{release}
@@ -174,11 +201,8 @@ and tools. It provides a good starting environment for Haskell development.
%prep
%setup -q -n %{name}-%{version}
-cd packages/GLUT-*
-%patch1 -p1 -b .orig
-
%ifarch ppc ppc64 s390 s390x
-cd ../alex-%{alex_version}
+cd alex-%{alex_version}
%patch2 -p1 -b .orig
%endif
@@ -193,7 +217,7 @@ PATH=$HOME/.cabal/bin:$PATH
%define cabal_configure_options --user
cd packages
-for i in $(egrep -v "^(primitive|split|vector)-" platform.packages); 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
@@ -201,11 +225,11 @@ case $name in
alex|cabal-install|happy)
%ghc_bin_build
;;
-# ghc-7.4.1 haddock breaks on GLUT
-GLUT)
-%ghc_lib_build_without_haddock $name $ver
-./Setup register --inplace
-;;
+## ghc-7.4.1 haddock breaks on GLUT
+#GLUT)
+#%%ghc_lib_build_without_haddock $name $ver
+#./Setup register --inplace
+#;;
haskell-platform)
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
@@ -236,7 +260,7 @@ cd packages
PACKAGES_DIR=$PWD
-for i in $(egrep -v "^(primitive|split|vector)-" platform.packages); 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
@@ -257,6 +281,14 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
cp -p bash-completion/cabal $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+
+# fix RPATHs in programs linking to HP user libs
+%if %{undefined ghc_without_dynamic}
+%ghc_fix_dynamic_rpath alex cabal happy
+%endif
+cd ..
+
+mv */*.files ..
cd ..
%ghc_strip_dynlinked
@@ -268,23 +300,6 @@ fi
mv %{buildroot}%{_datadir}/HUnit-*/* %{buildroot}%{_docdir}/ghc-HUnit-*/
-mv */*.files ..
-cd ..
-
-# fix RPATHs in programs linking to HP user libs
-%if %{undefined ghc_without_dynamic}
-for i in alex cabal happy; do
- PROG=%{buildroot}%{_bindir}/$i
- RPATH=$(chrpath $PROG| sed -e "s!^$PROG: RPATH=!!")
- case $RPATH in
- *$PACKAGES_DIR*)
- NEWRPATH=$(echo $RPATH | sed -e "s!$PACKAGES_DIR!%{ghclibdir}!g" -e "s!/dist/build!!g")
- chrpath -r $NEWRPATH $PROG
- ;;
- esac
-done
-%endif
-
%ghc_devel_post_postun haskell-platform
@@ -331,6 +346,12 @@ done
%changelog
+* Sat May 4 2013 Jens Petersen <petersen at redhat.com> - 2013.2.0.0-22.1
+- update to 2013.2.0.0-rc1
+- new packages: GLURaw, OpenGLRaw
+- new depends: attoparsec, case-insensitive, hashable, unordered-containers
+- use ghc_fix_dynamic_rpath
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012.4.0.0-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list