Revert "update to new haskell-platform 7.10.2-a"
This reverts commit 60545cc54137a9f50243a350ecdc29a847aba6ab.
This commit is contained in:
Jens Petersen
parent
e973df3a93
commit
62c8da19d7
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,4 +9,3 @@ haskell-platform-2010.2.0.0.tar.gz
|
||||
/haskell-platform-2013.2.0.0.tar.gz
|
||||
/haskell-platform-2014.2.0.0-srcdist-RC3.tar.gz
|
||||
/haskell-platform-2014.2.0.0-srcdist.tar.gz
|
||||
/haskell-platform-7.10.2-a.tar.gz
|
||||
|
||||
54
haskell-platform-2014.2.0.0-version-bumps.patch
Normal file
54
haskell-platform-2014.2.0.0-version-bumps.patch
Normal file
@ -0,0 +1,54 @@
|
||||
--- haskell-platform-2014.2.0.0/haskell-platform.cabal.orig 2014-08-01 04:03:34.000000000 +0900
|
||||
+++ haskell-platform-2014.2.0.0/haskell-platform.cabal 2015-04-03 19:11:23.516593508 +0900
|
||||
@@ -1,5 +1,5 @@
|
||||
name: haskell-platform
|
||||
-version: 2014.2.0.0
|
||||
+version: 2014.2.0.0.2
|
||||
homepage: http://haskell.org/platform
|
||||
license: BSD3
|
||||
license-file: LICENSE
|
||||
@@ -32,7 +32,7 @@
|
||||
library
|
||||
if flag(include-ghc-depends)
|
||||
build-depends:
|
||||
- ghc ==7.8.3,
|
||||
+ ghc ==7.8.4,
|
||||
|
||||
-- Core libraries: provided by every ghc installation
|
||||
-- We don't include "non-API" packages here.
|
||||
@@ -65,7 +65,7 @@
|
||||
-- Libraries in addition to what GHC provides:
|
||||
-- Note: newer versions of cgi need monad-catchio.
|
||||
async ==2.0.1.5,
|
||||
- attoparsec ==0.10.4.0,
|
||||
+ attoparsec ==0.11.3.4,
|
||||
case-insensitive ==1.1.0.3,
|
||||
fgl ==5.5.0.1,
|
||||
GLUT ==2.5.1.1,
|
||||
@@ -82,7 +82,7 @@
|
||||
parallel ==3.2.0.4,
|
||||
parsec ==3.1.5,
|
||||
primitive ==0.5.2.1,
|
||||
- QuickCheck ==2.6,
|
||||
+ QuickCheck ==2.7.6,
|
||||
random ==1.0.1.1,
|
||||
regex-base ==0.93.2,
|
||||
regex-compat ==0.95.1,
|
||||
@@ -90,7 +90,7 @@
|
||||
split ==0.2.2,
|
||||
stm ==2.4.2,
|
||||
syb ==0.4.1,
|
||||
- text ==1.1.0.0,
|
||||
+ text ==1.1.1.3,
|
||||
unordered-containers ==0.2.4.0,
|
||||
vector ==0.10.9.1,
|
||||
xhtml ==3000.2.1,
|
||||
@@ -103,7 +103,7 @@
|
||||
-- Depending on programs does not work, they are not registered
|
||||
-- We list them to help distro packaging.
|
||||
build-tools:
|
||||
- cabal-install ==1.18.0.5,
|
||||
+-- cabal-install ==1.18.0.5,
|
||||
alex ==3.1.3,
|
||||
happy ==1.19.4,
|
||||
hscolour ==1.20.3
|
||||
@ -1,11 +0,0 @@
|
||||
--- haskell-platform-7.10.2-a/haskell-platform.cabal~ 2015-08-06 00:06:13.000000000 +0900
|
||||
+++ haskell-platform-7.10.2-a/haskell-platform.cabal 2015-10-02 18:40:24.046614029 +0900
|
||||
@@ -110,7 +110,7 @@
|
||||
-- Depending on programs does not work, they are not registered
|
||||
-- We list them to help distro packaging.
|
||||
build-tools:
|
||||
- cabal-install ==1.22.6.0,
|
||||
+-- cabal-install ==1.22.6.0,
|
||||
alex ==3.1.4,
|
||||
happy ==1.19.5,
|
||||
hscolour ==1.23,
|
||||
@ -1,61 +1,58 @@
|
||||
# https://fedoraproject.org/wiki/Packaging:Haskell
|
||||
|
||||
%global upstream_version 7.10.2
|
||||
|
||||
%global ghc_compiler_version %{upstream_version}
|
||||
%global ghc_compiler_version 7.8.4
|
||||
%global alex_version 3.1.4
|
||||
%global cabal_install_version 1.22.6.0
|
||||
%global cabal_install_version 1.18.1.0
|
||||
%global happy_version 1.19.5
|
||||
%global hscolour_version 1.23
|
||||
|
||||
%global async_version 2.0.2
|
||||
%global attoparsec_version 0.13.0.1
|
||||
%global case_insensitive_version 1.2.0.4
|
||||
%global hashable_version 1.2.3.3
|
||||
%global HTTP_version 4000.2.20
|
||||
%global HTTP_version 4000.2.10
|
||||
%global HUnit_version 1.2.5.2
|
||||
%global html_version 1.0.1.2
|
||||
%global mtl_version 2.2.1
|
||||
%global network_version 2.6.2.1
|
||||
%global parallel_version 3.2.0.6
|
||||
%global parsec_version 3.1.9
|
||||
%global primitive_version 0.6
|
||||
%global QuickCheck_version 2.8.1
|
||||
%global random_version 1.1
|
||||
%global mtl_version 2.1.3.1
|
||||
%global network_version 2.4.2.3
|
||||
%global parallel_version 3.2.0.4
|
||||
%global parsec_version 3.1.5
|
||||
%global QuickCheck_version 2.7.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 split_version 0.2.2
|
||||
%global stm_version 2.4.4
|
||||
%global syb_version 0.5.1
|
||||
%global text_version 1.2.1.3
|
||||
%global unordered_containers_version 0.2.5.1
|
||||
%global vector_version 0.11.0.0
|
||||
%global stm_version 2.4.2
|
||||
%global syb_version 0.4.1
|
||||
%global text_version 1.1.1.3
|
||||
%global xhtml_version 3000.2.1
|
||||
%global zlib_version 0.5.4.2
|
||||
# new in HP 7.10.2
|
||||
%global exceptions_version 0.8.0.2
|
||||
%global network_uri_version 2.6.0.3
|
||||
%global scientific_version 0.3.3.8
|
||||
%global tf_random_version 0.5
|
||||
%global transformers_compat_version 0.4.0.4
|
||||
%global zlib_version 0.5.4.1
|
||||
# 2012.4
|
||||
%global async_version 2.0.1.5
|
||||
%global primitive_version 0.5.2.1
|
||||
%global split_version 0.2.2
|
||||
%global vector_version 0.10.9.1
|
||||
# 2013.2
|
||||
%global attoparsec_version 0.11.3.4
|
||||
%global case_insensitive_version 1.1.0.3
|
||||
%global hashable_version 1.2.2.0
|
||||
%global unordered_containers_version 0.2.4.0
|
||||
# 2014.2
|
||||
%global hscolour_version 1.20.3
|
||||
|
||||
%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|tf-random|exceptions|transformers-compat|scientific|network-uri
|
||||
%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 upstream_version 2014.2.0.0
|
||||
|
||||
Name: haskell-platform
|
||||
Version: %{upstream_version}
|
||||
Version: %{upstream_version}.2
|
||||
# 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: 1%{?dist}
|
||||
Release: 5%{?dist}
|
||||
Summary: Standard Haskell distribution
|
||||
|
||||
Group: Development/Tools
|
||||
License: BSD
|
||||
URL: http://www.haskell.org/platform/
|
||||
Source0: http://www.haskell.org/platform/download/%{version}/%{name}-%{upstream_version}-a.tar.gz
|
||||
Patch1: haskell-platform-build-tools-cabal-install.patch
|
||||
Source0: http://www.haskell.org/platform/download/%{version}/%{name}-%{upstream_version}-srcdist.tar.gz
|
||||
Patch1: haskell-platform-2014.2.0.0-version-bumps.patch
|
||||
|
||||
BuildRequires: ghc-Cabal-devel
|
||||
BuildRequires: ghc-rpm-macros-extra
|
||||
@ -66,16 +63,11 @@ BuildRequires: ghc-compiler = %{ghc_compiler_version}
|
||||
# GLUT
|
||||
BuildRequires: freeglut-devel%{?_isa}
|
||||
BuildRequires: happy = %{happy_version}
|
||||
BuildRequires: hscolour = %{hscolour_version}
|
||||
# OpenGL
|
||||
BuildRequires: mesa-libGL-devel%{?_isa},mesa-libGLU-devel%{?_isa}
|
||||
BuildRequires: ghc-async-devel = %{async_version}
|
||||
BuildRequires: ghc-attoparsec-devel = %{attoparsec_version}
|
||||
BuildRequires: ghc-bytestring-devel
|
||||
BuildRequires: ghc-case-insensitive-devel = %{case_insensitive_version}
|
||||
BuildRequires: ghc-deepseq-devel
|
||||
BuildRequires: ghc-hashable-devel = %{hashable_version}
|
||||
BuildRequires: ghc-hscolour-devel = %{hscolour_version}
|
||||
BuildRequires: ghc-haskell98-devel
|
||||
BuildRequires: ghc-HUnit-devel = %{HUnit_version}
|
||||
BuildRequires: ghc-HTTP-devel = %{HTTP_version}
|
||||
BuildRequires: ghc-html-devel = %{html_version}
|
||||
@ -83,29 +75,33 @@ BuildRequires: ghc-mtl-devel = %{mtl_version}
|
||||
BuildRequires: ghc-network-devel = %{network_version}
|
||||
BuildRequires: ghc-parallel-devel = %{parallel_version}
|
||||
BuildRequires: ghc-parsec-devel = %{parsec_version}
|
||||
BuildRequires: ghc-primitive-devel = %{primitive_version}
|
||||
BuildRequires: ghc-QuickCheck-devel = %{QuickCheck_version}
|
||||
BuildRequires: ghc-random-devel = %{random_version}
|
||||
BuildRequires: ghc-regex-base-devel = %{regex_base_version}
|
||||
BuildRequires: ghc-regex-compat-devel = %{regex_compat_version}
|
||||
BuildRequires: ghc-regex-posix-devel = %{regex_posix_version}
|
||||
BuildRequires: ghc-split-devel = %{split_version}
|
||||
BuildRequires: ghc-stm-devel = %{stm_version}
|
||||
BuildRequires: ghc-syb-devel = %{syb_version}
|
||||
%ifarch %{ghc_arches_with_ghci}
|
||||
BuildRequires: ghc-template-haskell-devel
|
||||
%endif
|
||||
BuildRequires: ghc-text-devel = %{text_version}
|
||||
BuildRequires: ghc-time-devel
|
||||
BuildRequires: ghc-unordered-containers-devel = %{unordered_containers_version}
|
||||
BuildRequires: ghc-vector-devel = %{vector_version}
|
||||
BuildRequires: ghc-xhtml-devel = %{xhtml_version}
|
||||
BuildRequires: ghc-zlib-devel = %{zlib_version}
|
||||
# new in HP 7.10.2
|
||||
BuildRequires: ghc-exceptions-devel = %{exceptions_version}
|
||||
BuildRequires: ghc-network-uri-devel = %{network_uri_version}
|
||||
BuildRequires: ghc-scientific-devel = %{scientific_version}
|
||||
BuildRequires: ghc-tf-random-devel = %{tf_random_version}
|
||||
BuildRequires: ghc-transformers-compat-devel = %{transformers_compat_version}
|
||||
|
||||
# part of HP-2012.4
|
||||
BuildRequires: ghc-async-devel = %{async_version}
|
||||
BuildRequires: ghc-primitive-devel = %{primitive_version}
|
||||
BuildRequires: ghc-split-devel = %{split_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}
|
||||
# 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}
|
||||
@ -125,22 +121,15 @@ and tools. It provides a good starting environment for Haskell development.
|
||||
%global haskell_platform_version %{version}
|
||||
|
||||
%if %{defined ghclibdir}
|
||||
%ghc_lib_subpackage cgi 3001.2.2.2
|
||||
%ghc_lib_subpackage fgl 5.5.2.1
|
||||
%ghc_lib_subpackage -c mesa-libGLU-devel%{?_isa} GLURaw 1.5.0.1
|
||||
%ghc_lib_subpackage -c freeglut-devel%{?_isa} GLUT 2.7.0.1
|
||||
%ghc_lib_subpackage fgl 5.5.0.1
|
||||
%ghc_lib_subpackage -c mesa-libGLU-devel%{?_isa} GLURaw 1.4.0.1
|
||||
%ghc_lib_subpackage -c freeglut-devel%{?_isa} GLUT 2.5.1.1
|
||||
# used by lambdabot-utils
|
||||
%ghc_lib_subpackage haskell-src 1.0.2.0
|
||||
%ghc_lib_subpackage OpenGL 2.12.0.1
|
||||
%ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw 2.5.1.0
|
||||
%ghc_lib_subpackage old-locale 1.0.0.7
|
||||
%ghc_lib_subpackage old-time 1.1.0.3
|
||||
%ghc_lib_subpackage multipart 0.1.2
|
||||
%ghc_lib_subpackage ObjectName 1.1.0.0
|
||||
%ghc_lib_subpackage StateVar 1.1.0.0
|
||||
%ghc_lib_subpackage haskell-src 1.0.1.6
|
||||
%ghc_lib_subpackage OpenGL 2.9.2.0
|
||||
%ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw 1.5.0.0
|
||||
%endif
|
||||
|
||||
|
||||
%package -n ghc-haskell-platform-devel
|
||||
Summary: Haskell Platform library development files
|
||||
Requires(post): ghc-compiler = %{ghc_version}
|
||||
@ -189,7 +178,7 @@ This provides the haskell-platform meta library package.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{upstream_version}-a
|
||||
%setup -q -n %{name}-%{upstream_version}
|
||||
%patch1 -p1 -b .orig
|
||||
|
||||
# hack for h-p.cabal in top dir
|
||||
@ -197,8 +186,19 @@ mkdir packages/%{name}-%{version}
|
||||
cp LICENSE hptool/Setup.hs packages/%{name}-%{version}
|
||||
|
||||
|
||||
%ifarch aarch64
|
||||
# bz#1210323
|
||||
cabal-tweak-dep-ver alex '==3.1.3' ''
|
||||
cabal-tweak-dep-ver cabal-install '==1.18.0.5' ''
|
||||
cabal-tweak-dep-ver happy '==1.19.4' ''
|
||||
cabal-tweak-dep-ver hscolour '==1.20.3' ''
|
||||
%else
|
||||
cabal-tweak-dep-ver alex '==3.1.3' '==3.1.4'
|
||||
cabal-tweak-dep-ver cabal-install '==1.18.0.5' '==%{cabal_install_version}'
|
||||
cabal-tweak-dep-ver happy '==1.19.4' '==1.19.5'
|
||||
# HsColour reports 1.20
|
||||
cabal-tweak-dep-ver hscolour '==1.23' '==1.20'
|
||||
cabal-tweak-dep-ver hscolour '==1.20.3' '==1.20'
|
||||
%endif
|
||||
mv %{name}.cabal packages/%{name}-%{version}
|
||||
|
||||
|
||||
@ -233,8 +233,9 @@ name=$(echo $i | sed -e "s/\(.*\)-.*/\1/")
|
||||
ver=$(echo $i | sed -e "s/.*-\(.*\)/\1/")
|
||||
cd $name-$ver
|
||||
%ghc_lib_install $name $ver
|
||||
echo "%%license packages/$name-$ver/LICENSE" >> ghc-$name.files
|
||||
rm %{buildroot}%{_docdir}/ghc-$name/LICENSE
|
||||
# for ghc-7.8
|
||||
#%%ghc_gen_filelists $name $ver
|
||||
echo "%doc packages/$name-$ver/LICENSE" >> ghc-$name.files
|
||||
cd ..
|
||||
done
|
||||
|
||||
@ -243,6 +244,8 @@ cd ..
|
||||
|
||||
%ghc_strip_dynlinked
|
||||
|
||||
rm %{buildroot}/%{_docdir}/ghc-%{name}*/LICENSE
|
||||
|
||||
|
||||
%post -n ghc-haskell-platform-devel
|
||||
%ghc_pkg_recache
|
||||
@ -253,19 +256,14 @@ cd ..
|
||||
|
||||
|
||||
%files
|
||||
%license packages/%{name}-%{version}/LICENSE
|
||||
%doc packages/%{name}-%{version}/LICENSE
|
||||
|
||||
|
||||
%files -n ghc-haskell-platform-devel -f ghc-haskell-platform-devel.files
|
||||
%license packages/haskell-platform-%{version}/LICENSE
|
||||
%doc packages/haskell-platform-%{version}/LICENSE
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Oct 2 2015 Jens Petersen <petersen@redhat.com> - 7.10.2-1
|
||||
- update to new haskell-platform version 7.10.2-a
|
||||
- new old-locale old-time multipart ObjectName StateVar subpackages
|
||||
- haskell98 dropped and cgi is back
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2014.2.0.0.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user