From 5ef7655a5ad5c76f7e122e2d01ec76e50d9669ae Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 8 May 2019 17:30:55 +0800 Subject: [PATCH] now just a noarch metapackage: obsolete old libs --- haskell-platform.spec | 111 ++++++++++++------------------------------ sources | 1 - 2 files changed, 32 insertions(+), 80 deletions(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index e95cf4d..4a94e9e 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -1,110 +1,63 @@ # https://fedoraproject.org/wiki/Packaging:Haskell -%global pkg_name haskell-platform - -%global upstream_version 8.2.2 - -%global ghc_compiler_version %{upstream_version} -%global alex_version 3.2.4 -%global cabal_install_version 2.0.0.1 -%global happy_version 1.19.9 -%global hscolour_version 1.24.4 - -%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 - Name: haskell-platform -Version: 2018.%{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 -# - haskell-src version unchanged -Release: 15%{?dist} +Version: 2019.1 +Release: 1%{?dist} Summary: Standard Haskell distribution License: BSD URL: http://www.haskell.org/platform/ -Source0: http://www.haskell.org/platform/download/%{upstream_version}/%{name}-%{upstream_version}.tar.gz -BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros-extra - -BuildRequires: alex = %{alex_version} -BuildRequires: cabal-install = %{cabal_install_version} -BuildRequires: ghc-compiler = %{ghc_compiler_version} -BuildRequires: happy = %{happy_version} -BuildRequires: hscolour = %{hscolour_version} -# GLUT -BuildRequires: freeglut-devel -# OpenGL -BuildRequires: mesa-libGL-devel, mesa-libGLU-devel -BuildRequires: ghc-StateVar-devel -# ObjectName: -BuildRequires: ghc-transformers-devel -# haskell-src: -BuildRequires: ghc-syb-devel -# OpenGLRaw: -BuildRequires: ghc-text-devel +BuildArch: noarch +BuildRequires: ghc +BuildRequires: alex +BuildRequires: cabal-install +BuildRequires: happy +BuildRequires: hscolour # 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: hscolour = %{hscolour_version} +Requires: ghc +Requires: alex +Requires: cabal-install +Requires: happy +Requires: hscolour # F17: Obsoletes: ghc-haskell-platform < %{version}-%{release} # F26: Obsoletes: ghc-haskell-platform-devel < %{version}-%{release} +# F30 +Obsoletes : ghc-fixed < 0.2.1.1-16, ghc-fixed-devel < 0.2.1.1-16 +Obsoletes : ghc-GLURaw < 2.0.0.4, ghc-GLURaw-devel < 2.0.0.4 +Obsoletes : ghc-GLUT < 2.7.0.13, ghc-GLUT-devel < 2.7.0.13 +Obsoletes : ghc-half < 0.3, ghc-half-devel < 0.3 +Obsoletes : ghc-haskell-src < 1.0.3.0, ghc-haskell-src-devel < 1.0.3.0 +Obsoletes : ghc-ObjectName < 1.1.0.1-16, ghc-ObjectName-devel < 1.1.0.1-16 +Obsoletes : ghc-OpenGL < 3.0.2.1, ghc-OpenGL-devel < 3.0.2.1 +Obsoletes : ghc-OpenGLRaw < 3.2.6.0, ghc-OpenGLRaw-devel < 3.2.6.0 %description -Haskell Platform is a suite of stable and well used Haskell libraries -and tools. It provides a good starting environment for Haskell development. - - -%global BSDHaskellReport BSD%{space}and%{space}HaskellReport - -%global haskell_platform_version %{version} - -%if %{defined ghclibdir} -%ghc_lib_subpackage fixed-0.2.1.1 -#%%ifnarch armv7hl -# OpenGLRaw-2.6.0.0 started failing: -%ghc_lib_subpackage -c mesa-libGLU-devel%{?_isa} GLURaw-2.0.0.3 -%ghc_lib_subpackage -c freeglut-devel%{?_isa} GLUT-2.7.0.12 -%ghc_lib_subpackage OpenGL-3.0.2.0 -%ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw-3.2.5.0 -#%%endif -%ghc_lib_subpackage half-0.2.2.3 -%ghc_lib_subpackage haskell-src-1.0.2.0 -%ghc_lib_subpackage ObjectName-1.1.0.1 -%endif - -%global version %{haskell_platform_version} - +Haskell Platform is a set stable and well used Haskell tools. +It provides a good starting environment for Haskell development. %prep -%setup -q -n %{name}-%{upstream_version} - -mv packages/* . - +%{nil} %build -%ghc_libs_build $(grep \-E \-v "^(%{?separate_packages})-[0-9]" etc/build.packages) - +%{nil} %install -%ghc_libs_install $(grep \-E \-v "^(%{?separate_packages})-[0-9]" etc/build.packages) -%ghc_strip_dynlinked - +%{nil} %files -%license LICENSE -%doc README.md %changelog +* Wed May 8 2019 fedora-toolbox - 2019.1-1 +- haskell-platform is now just a meta-package +- obsolete previous subpackaged Haskell Platform libraries +- package is now noarch + * Fri Feb 01 2019 Fedora Release Engineering - 2018.8.2.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 1f10cbf..e69de29 100644 --- a/sources +++ b/sources @@ -1 +0,0 @@ -SHA512 (haskell-platform-8.2.2.tar.gz) = 915c88770d764772bef350dcf75d900ad355eefd57f5dac93f8cb53927259cd6b7d01e0ea9f36c3ceef211344cf74d64b9a618a944f1efa92b6feb9641669973