From 7dea3a5231ab2d95da1ee29ea6351fe07f953b24 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mar 18 2021 09:58:36 +0000 Subject: retry was packaged in Fedora --- diff --git a/haskell-platform.spec b/haskell-platform.spec index 8ade6c0..e700639 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -15,15 +15,14 @@ %global pantry pantry-0.4.0.2 %global projecttemplate project-template-0.2.1.0 %global regexapplicativetext regex-applicative-text-0.1.0.1 -%global retry retry-0.8.1.2 %global rioorphans rio-orphans-0.1.1.0 %global casaclient casa-client-0.0.1 %global casatypes casa-types-0.0.1 -%global subpkgs %{filelock} %{hifileparser} %{hpack} %{retry} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{regexapplicativetext} %{stack} +%global subpkgs %{filelock} %{hifileparser} %{hpack} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{regexapplicativetext} %{stack} Name: haskell-platform Version: 2020.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Standard Haskell distribution License: BSD @@ -42,10 +41,9 @@ Source8: https://hackage.haskell.org/package/%{openbrowser}/%{openbrowser Source9: https://hackage.haskell.org/package/%{pantry}/%{pantry}.tar.gz Source10: https://hackage.haskell.org/package/%{projecttemplate}/%{projecttemplate}.tar.gz Source11: https://hackage.haskell.org/package/%{regexapplicativetext}/%{regexapplicativetext}.tar.gz -Source12: https://hackage.haskell.org/package/%{retry}/%{retry}.tar.gz -Source13: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz -Source14: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz -Source15: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz +Source12: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz +Source13: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz +Source14: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz # End cabal-rpm sources #Patch0: stack-2.1-relax_version_warnings.patch @@ -119,7 +117,7 @@ BuildRequires: ghc-primitive-prof BuildRequires: ghc-process-prof #BuildRequires: ghc-project-template-prof #BuildRequires: ghc-regex-applicative-text-prof -#BuildRequires: ghc-retry-prof +BuildRequires: ghc-retry-prof BuildRequires: ghc-rio-prof BuildRequires: ghc-rio-prettyprint-prof BuildRequires: ghc-semigroups-prof @@ -168,8 +166,6 @@ BuildRequires: ghc-tar-conduit-prof BuildRequires: ghc-resourcet-prof # for missing dep 'regex-applicative-text': BuildRequires: ghc-regex-applicative-prof -# for missing dep 'retry': -BuildRequires: ghc-random-prof # for missing dep 'rio-orphans': BuildRequires: ghc-fast-logger-prof BuildRequires: ghc-monad-control-prof @@ -229,7 +225,6 @@ Stack is a cross-platform program for developing Haskell projects. %ghc_lib_subpackage -l BSD %{pantry} %ghc_lib_subpackage -l BSD %{projecttemplate} %ghc_lib_subpackage -l BSD %{regexapplicativetext} -%ghc_lib_subpackage -l BSD %{retry} %ghc_lib_subpackage -l MIT %{rioorphans} %ghc_lib_subpackage -l BSD %{casaclient} %ghc_lib_subpackage -l BSD %{casatypes} @@ -241,7 +236,7 @@ Stack is a cross-platform program for developing Haskell projects. %prep # Begin cabal-rpm setup: -%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 +%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 # End cabal-rpm setup #%%patch0 -b .orig ( @@ -284,6 +279,9 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Thu Mar 18 2021 Jens Petersen - 2020.2-10 +- retry was packaged in Fedora + * Tue Jan 26 2021 Fedora Release Engineering - 2020.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild