From e9169782c80cac48cb446fbc5734ccd52117c360 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mar 10 2017 14:43:40 +0000 Subject: update to 8.0.2; drop ghc-haskell-platform-devel haskell-platform-8.0 basically just provides the core tools through it still bundles various libraries in the tarball --- diff --git a/.gitignore b/.gitignore index ae2d664..83c6a98 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ haskell-platform-2010.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.3.tar.gz +/haskell-platform-8.0.2.tar.gz diff --git a/haskell-platform.spec b/haskell-platform.spec index bc630ee..71668ce 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -1,71 +1,38 @@ +%global without_prof 1 + # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name haskell-platform -%global upstream_version 7.10.3 +%global upstream_version 8.0.2 %global ghc_compiler_version %{upstream_version} -%global alex_version 3.1.7 -%global cabal_install_version 1.22.9.0 +%global alex_version 3.2.1 +%global cabal_install_version 1.24.0.2 %global happy_version 1.19.5 -%global hscolour_version 1.23 - -%global async_version 2.1.0 -%global attoparsec_version 0.13.0.2 -%global case_insensitive_version 1.2.0.6 -%global hashable_version 1.2.4.0 -%global HTTP_version 4000.3.3 -%global HUnit_version 1.3.1.1 -%global html_version 1.0.1.2 -%global mtl_version 2.2.1 -%global old_locale_version 1.0.0.7 -%global old_time_version 1.1.0.3 -%global network_version 2.6.2.1 -%global parallel_version 3.2.1.0 -%global parsec_version 3.1.11 -%global primitive_version 0.6.1.0 -%global QuickCheck_version 2.8.2 -%global random_version 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.3.1 -%global stm_version 2.4.4 -%global syb_version 0.6 -%global text_version 1.2.2.1 -%global unordered_containers_version 0.2.7.1 -%global vector_version 0.11.0.0 -%global xhtml_version 3000.2.1 -%global zlib_version 0.6.1.1 -# new in HP 7.10 -%global exceptions_version 0.8.0.2 -%global network_uri_version 2.6.1.0 -%global scientific_version 0.3.4.7 -%global tf_random_version 0.5 -%global transformers_compat_version 0.4.0.4 - -%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|old-locale|old-time - -%ifarch armv7hl -%global separate_packages %{separate_packages}|OpenGL|OpenGLRaw|GLUT|GLURaw -%endif +%global hscolour_version 1.24.1 + +%global separate_packages QuickCheck|HTTP|HUnit|StateVar|alex|cabal-install|call-stack|fgl|happy|html|integer-logarithms|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|old-locale|old-time + +#%%ifarch armv7hl +#%%global separate_packages %{separate_packages}|OpenGL|OpenGLRaw|GLUT|GLURaw +#%%endif Name: haskell-platform -Version: 2016.%{upstream_version} +Version: 2017.%{upstream_version} # 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: 4%{?dist} +# - haskell-src version unchanged +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/%{upstream_version}/%{name}-%{upstream_version}.tar.gz -Patch1: haskell-platform-build-tools-cabal-install.patch -Patch2: haskell-platform-7.10.3-version.patch -Patch3: haskell-platform-armv7-disable-GL.patch +Patch1: haskell-platform-8.0.2-build-tools.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra >= 1.6.4 @@ -73,59 +40,31 @@ BuildRequires: ghc-rpm-macros-extra >= 1.6.4 BuildRequires: alex = %{alex_version} BuildRequires: cabal-install = %{cabal_install_version} BuildRequires: ghc-compiler = %{ghc_compiler_version} -# GLUT -BuildRequires: freeglut-devel%{?_isa} BuildRequires: happy = %{happy_version} BuildRequires: hscolour = %{hscolour_version} +# GLUT +BuildRequires: freeglut-devel%{?_isa} # 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-HUnit-devel = %{HUnit_version} -BuildRequires: ghc-HTTP-devel = %{HTTP_version} -BuildRequires: ghc-html-devel = %{html_version} -BuildRequires: ghc-mtl-devel = %{mtl_version} -BuildRequires: ghc-old-locale-devel = %{old_locale_version} -BuildRequires: ghc-old-time-devel = %{old_time_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} -BuildRequires: ghc-template-haskell-devel -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 -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} - - -# ghci "ghc" library is not officially part of hackage-platform -Requires: ghc-compiler = %{ghc_compiler_version} +BuildRequires: ghc-StateVar-devel +# ObjectName: +BuildRequires: ghc-transformers-devel +# haskell-src: +BuildRequires: ghc-syb-devel +# OpenGLRaw: +BuildRequires: ghc-text-devel + +# pull in all of ghc for least surprise +# even though strictly libghc is not formally part of HP +Requires: ghc = %{ghc_compiler_version} 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} +# F17: +Obsoletes: ghc-haskell-platform < %{version}-%{release} +# F26: +Obsoletes: ghc-haskell-platform-devel < %{version}-%{release} %description Haskell Platform is a suite of stable and well used Haskell libraries @@ -137,135 +76,51 @@ 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.3 +#%%ghc_lib_subpackage fgl-5.5.3.0 +%ghc_lib_subpackage fixed-0.2.1.1 +#%%ifnarch armv7hl # OpenGLRaw-2.6.0.0 started failing: -%ifnarch armv7hl -%ghc_lib_subpackage -c mesa-libGLU-devel%{?_isa} GLURaw-1.5.0.2 -%ghc_lib_subpackage -c freeglut-devel%{?_isa} GLUT-2.7.0.3 -%ghc_lib_subpackage OpenGL-2.13.1.0 -%ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw-2.6.0.0 -%endif -%ghc_lib_subpackage half-0.2.2.1 +%ghc_lib_subpackage -c mesa-libGLU-devel%{?_isa} GLURaw-2.0.0.3 +%ghc_lib_subpackage -c freeglut-devel%{?_isa} GLUT-2.7.0.10 +%ghc_lib_subpackage OpenGL-3.0.1.0 +%ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw-3.2.4.0 +#%%endif +%ghc_lib_subpackage half-0.2.2.3 %ghc_lib_subpackage haskell-src-1.0.2.0 -%ghc_lib_subpackage multipart-0.1.2 -%ghc_lib_subpackage ObjectName-1.1.0.0 -%ghc_lib_subpackage StateVar-1.1.0.1 +%ghc_lib_subpackage ObjectName-1.1.0.1 +#%%ghc_lib_subpackage StateVar-1.1.0.4 %endif - -%package -n ghc-haskell-platform-devel -Summary: Haskell Platform library development files -Requires(post): ghc-compiler = %{ghc_version} -Requires(postun): ghc-compiler = %{ghc_version} -%{?ghc_packages_list:Requires: %(echo %{ghc_packages_list} | sed -e "s/\([^ ]*\)-\([^ ]*\)/ghc-\1-devel = \2-%{release},/g")} -# pull in all of ghc for least surprise -# even though libghc is not formally part of HP -Requires: ghc = %{ghc_compiler_version} -Requires: ghc-HUnit-devel = %{HUnit_version} -Requires: ghc-HTTP-devel = %{HTTP_version} -Requires: ghc-html-devel = %{html_version} -Requires: ghc-mtl-devel = %{mtl_version} -Requires: ghc-network-devel = %{network_version} -Requires: ghc-parallel-devel = %{parallel_version} -Requires: ghc-parsec-devel = %{parsec_version} -Requires: ghc-QuickCheck-devel = %{QuickCheck_version} -Requires: ghc-random-devel = %{random_version} -Requires: ghc-regex-base-devel = %{regex_base_version} -Requires: ghc-regex-compat-devel = %{regex_compat_version} -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-zlib-devel = %{zlib_version} -# part of HP-2012.4 -Requires: ghc-async-devel = %{async_version} -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} -# part of HP-2014.2 -Requires: ghc-hscolour-devel = %{hscolour_version} -# 7.10.3 -Requires: ghc-old-locale-devel = %{old_locale_version} -Requires: ghc-old-time-devel = %{old_time_version} -# added in F17 devel cycle -Obsoletes: ghc-haskell-platform < %{version}-%{release} - -%description -n ghc-haskell-platform-devel -This provides the haskell-platform meta library package. - - %global version %{haskell_platform_version} %prep %setup -q -n %{name}-%{upstream_version} -%patch1 -p1 -b .orig -%patch2 -p1 -%ifarch armv7hl -%patch3 -p1 -%endif - -cabal-tweak-dep-ver alex '==3.1.4' '==%{alex_version}' -cabal-tweak-dep-ver async '==2.0.2' '==%{async_version}' -cabal-tweak-dep-ver attoparsec '==0.13.0.1' '==%{attoparsec_version}' -cabal-tweak-dep-ver case-insensitive '==1.2.0.5' '==%{case_insensitive_version}' -cabal-tweak-dep-ver hashable '==1.2.3.3' '==%{hashable_version}' -# HsColour reports 1.22 -cabal-tweak-dep-ver hscolour '==1.23' '==1.22' -cabal-tweak-dep-ver HTTP '==4000.2.20' '==%{HTTP_version}' -cabal-tweak-dep-ver HUnit '==1.3.0.0' '==%{HUnit_version}' -cabal-tweak-dep-ver network-uri '==2.6.0.3' '==%{network_uri_version}' -cabal-tweak-dep-ver parallel '==3.2.0.6' '==%{parallel_version}' -cabal-tweak-dep-ver parsec '==3.1.9' '==%{parsec_version}' -cabal-tweak-dep-ver QuickCheck '==2.8.1' '==%{QuickCheck_version}' -cabal-tweak-dep-ver scientific '==0.3.3.8' '==%{scientific_version}' -cabal-tweak-dep-ver split '==0.2.2' '==%{split_version}' -cabal-tweak-dep-ver text '==1.2.1.3' '==%{text_version}' -cabal-tweak-dep-ver unordered-containers '==0.2.5.1' '==%{unordered_containers_version}' -cabal-tweak-dep-ver zlib '==0.5.4.2' '==%{zlib_version}' mv packages/* . -ln -s hptool/Setup.hs . %build %ghc_libs_build $(egrep \-v "^(%{?separate_packages})-[0-9]" etc/build.packages) -%ghc_lib_build %install %ghc_libs_install $(egrep \-v "^(%{?separate_packages})-[0-9]" etc/build.packages) -%ghc_lib_install - -mv %{buildroot}%{_datadir}/licenses/{%{name},ghc-%{name}-devel} - %ghc_strip_dynlinked -%post -n ghc-%{name}-devel -%ghc_pkg_recache - - -%postun -n ghc-%{name}-devel -%ghc_pkg_recache - - %files - - -%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %license LICENSE %doc README %changelog +* Fri Mar 10 2017 Jens Petersen - 2017.8.0.2-5 +- update to 8.0.2 +- 'cgi' and 'multipart' dropped, add 'fixed' +- core haskell-platform now just provides tools +- drop ghc-haskell-platform-devel subpackage + * Fri Feb 10 2017 Jens Petersen - 2016.7.10.3-4 - subpackage build like for other packages diff --git a/sources b/sources index 59432ba..8062565 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -faa81bc0b035e2754d010c5c448d94cb haskell-platform-7.10.3.tar.gz +SHA512 (haskell-platform-8.0.2.tar.gz) = 615be108e878190c97d4b1eaadace86163ca8b334bb19f5a7a2fd13fc837d5bc7a1b22db27a0dac9d095e7269ca3e56c1eded447bfa71c515f9f5bca40ce0199