diff --git a/ghc-shelly.spec b/ghc-shelly.spec index 553093b..b5c03ef 100644 --- a/ghc-shelly.spec +++ b/ghc-shelly.spec @@ -5,16 +5,15 @@ %global pkgver %{pkg_name}-%{version} %global liftedasync lifted-async-0.10.2.3 -%global constraints constraints-0.13.4 %global typeequality type-equality-1 -%global subpkgs %{typeequality} %{constraints} %{liftedasync} +%global subpkgs %{typeequality} %{liftedasync} # testsuite missing deps: hspec-contrib Name: ghc-%{pkg_name} Version: 1.10.0 # can only be reset when all subpkgs bumped -Release: 10%{?dist} +Release: 11%{?dist} Summary: Shell-like (systems) programming in Haskell License: BSD-3-Clause @@ -22,9 +21,8 @@ Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{liftedasync}/%{liftedasync}.tar.gz -Source2: https://hackage.haskell.org/package/%{constraints}/%{constraints}.tar.gz -Source3: https://hackage.haskell.org/package/%{typeequality}/%{typeequality}.tar.gz -Source4: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal +Source2: https://hackage.haskell.org/package/%{typeequality}/%{typeequality}.tar.gz +Source3: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -68,17 +66,6 @@ BuildRequires: ghc-transformers-prof BuildRequires: ghc-transformers-base-prof BuildRequires: ghc-unix-compat-prof %endif -# for missing dep 'constraints': -BuildRequires: ghc-binary-devel -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-hashable-devel -BuildRequires: ghc-transformers-compat-devel -%if %{with ghc_prof} -BuildRequires: ghc-binary-prof -BuildRequires: ghc-deepseq-prof -BuildRequires: ghc-hashable-prof -BuildRequires: ghc-transformers-compat-prof -%endif # End cabal-rpm deps %description @@ -138,7 +125,6 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{defined ghclibdir} %ghc_lib_subpackage -l BSD-3-Clause %{liftedasync} -%ghc_lib_subpackage -l BSD-2-Clause %{constraints} %ghc_lib_subpackage -l BSD-3-Clause %{typeequality} %endif @@ -147,8 +133,8 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} -a1 -a2 -a3 -cp -bp %{SOURCE4} %{pkg_name}.cabal +%setup -q -n %{pkgver} -a1 -a2 +cp -bp %{SOURCE3} %{pkg_name}.cabal # End cabal-rpm setup ( cd %{typeequality} cabal-tweak-dep-ver base '<4.14' '<4.17' @@ -191,6 +177,9 @@ cp -bp %{SOURCE4} %{pkg_name}.cabal %changelog +* Sun Apr 2 2023 Jens Petersen - 1.10.0-11 +- constraints is now package in Fedora + * Sun Jan 22 2023 Jens Petersen - 1.10.0-10 - https://hackage.haskell.org/package/shelly-1.10.0/changelog - refresh to cabal-rpm-2.1.0 with SPDX migration diff --git a/sources b/sources index 499847d..96c41e8 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ SHA512 (shelly-1.10.0.tar.gz) = b16e410dbf96b33b28069c88375296a6516bb99ec0b35058175bc466da5b400492e96ee3ee18d9208c8a096fd97df573d63cdef1eb26142e74ea13acd02e99ca SHA512 (lifted-async-0.10.2.3.tar.gz) = b21ab3ccf04de748d3b0bf0ca8ae2c490fdfad4bcc5b9053a196da424923866d58bb735bc208ca600ae2d4d1d66545adc52e0826ba6bb63a7089d4946493e59a -SHA512 (constraints-0.13.4.tar.gz) = 3e4cf62ee897cc103332ae1823552c52568fe090968ee763b83a0cc95c978c6766db02a4cbc4e2c9d6f83d04bb731a91421d5078904847d204e5cc8d8ee59d5f SHA512 (type-equality-1.tar.gz) = 633675251719afa59c311ae82d18476d6e000fbbdc553a29da598da38a29cf73fffcbcd4b23a70dd397f10734ba6617633390874eea8a563a1e258654a9fe7d8