diff --git a/haskell-platform.spec b/haskell-platform.spec index f7fe634..daef955 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -18,14 +18,13 @@ %global retry retry-0.8.1.2 %global inferlicense infer-license-0.2.0 %global rioorphans rio-orphans-0.1.1.0 -%global thutilities th-utilities-0.2.4.0 %global casaclient casa-client-0.0.1 %global casatypes casa-types-0.0.1 -%global subpkgs %{filelock} %{hifileparser} %{inferlicense} %{hpack} %{retry} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{thutilities} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{regexapplicativetext} %{stack} +%global subpkgs %{filelock} %{hifileparser} %{inferlicense} %{hpack} %{retry} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{regexapplicativetext} %{stack} Name: haskell-platform Version: 2020.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Standard Haskell distribution License: BSD @@ -47,9 +46,8 @@ Source11: https://hackage.haskell.org/package/%{regexapplicativetext}/%{re Source12: https://hackage.haskell.org/package/%{retry}/%{retry}.tar.gz Source13: https://hackage.haskell.org/package/%{inferlicense}/%{inferlicense}.tar.gz Source14: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz -Source15: https://hackage.haskell.org/package/%{thutilities}/%{thutilities}.tar.gz -Source16: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz -Source17: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz +Source15: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz +Source16: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz # End cabal-rpm sources #Patch0: stack-2.1-relax_version_warnings.patch @@ -179,9 +177,6 @@ BuildRequires: ghc-monad-control-prof BuildRequires: ghc-monad-logger-prof BuildRequires: ghc-resourcet-prof BuildRequires: ghc-transformers-base-prof -# for missing dep 'th-utilities': -BuildRequires: ghc-syb-prof -BuildRequires: ghc-th-orphans-prof # for missing dep 'casa-client': BuildRequires: ghc-base16-bytestring-prof BuildRequires: ghc-resourcet-prof @@ -238,7 +233,6 @@ Stack is a cross-platform program for developing Haskell projects. %ghc_lib_subpackage -l BSD %{retry} %ghc_lib_subpackage -l MIT %{inferlicense} %ghc_lib_subpackage -l MIT %{rioorphans} -%ghc_lib_subpackage -l MIT %{thutilities} %ghc_lib_subpackage -l BSD %{casaclient} %ghc_lib_subpackage -l BSD %{casatypes} %ghc_lib_subpackage -l BSD %{stack} @@ -249,7 +243,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 -a16 -a17 +%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 # End cabal-rpm setup #%%patch0 -b .orig ( @@ -292,6 +286,9 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Sun Jan 17 2021 Jens Petersen - 2020.2-7 +- th-utilities is not longer needed for pantry/store + * Fri Sep 18 2020 Jens Petersen - stack: use recommends for zlib-devel diff --git a/sources b/sources index 3f7bff2..88b2bbf 100644 --- a/sources +++ b/sources @@ -15,4 +15,3 @@ SHA512 (regex-applicative-text-0.1.0.1.tar.gz) = 8ee1d581498e047a7b759476ce98c43 SHA512 (retry-0.8.1.2.tar.gz) = 42856d43035e7c3a8128768c1a12fb1fbbd33ebc12fba152f5559e117a6339ea35a75e06243c320623e42a70916ad9f5a141988c42df4e44acb084210e2488e7 SHA512 (rio-orphans-0.1.1.0.tar.gz) = 2e415ebcc7341cf1c913de54de3218ac487e310c9556d1e1bdb349f4e7b9d041ea729c21e2bfdbcded9a214c84f483e32839a4fec87b2af9b986db5aaa18b42a SHA512 (stack-2.3.3.tar.gz) = cb93e3bcb8f92e01f374806f07f366ca318d66e3b7bd3cfa3fe3b72dce954d2bb371f51e3f79fca8aec19d1d3adef370bb09237bf29340a1bc851a9a103d77a3 -SHA512 (th-utilities-0.2.4.0.tar.gz) = 9dfd8996811f0918ef103ddba7408ef36dd91978fad12e523ca89957e79f6799479adb01422251023ad224c9386309d22169a0105eadeccff609a08c5bfbce13