From 65b4fa29c3efee2a599d7b0ca21e695ecbcaf518 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Jan 2023 22:12:54 +0800 Subject: [PATCH] update to 4000.4.1 --- .gitignore | 1 + HTTP-4000.3.16.cabal => HTTP-4000.4.1.cabal | 88 +++++++++++---------- ghc-HTTP.spec | 24 +++++- sources | 2 +- 4 files changed, 67 insertions(+), 48 deletions(-) rename HTTP-4000.3.16.cabal => HTTP-4000.4.1.cabal (69%) diff --git a/.gitignore b/.gitignore index 45435bc..f318a3c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ HTTP-4000.0.9.tar.gz /HTTP-4000.3.14.tar.gz /HTTP-4000.3.15.tar.gz /HTTP-4000.3.16.tar.gz +/HTTP-4000.4.1.tar.gz diff --git a/HTTP-4000.3.16.cabal b/HTTP-4000.4.1.cabal similarity index 69% rename from HTTP-4000.3.16.cabal rename to HTTP-4000.4.1.cabal index d329695..f337f4c 100644 --- a/HTTP-4000.3.16.cabal +++ b/HTTP-4000.4.1.cabal @@ -1,7 +1,7 @@ -Name: HTTP -Version: 4000.3.16 -x-revision: 1 Cabal-Version: >= 1.10 +Name: HTTP +Version: 4000.4.1 +x-revision: 1 Build-type: Simple License: BSD3 License-file: LICENSE @@ -57,16 +57,15 @@ Description: Extra-Source-Files: CHANGES -tested-with: GHC==9.0.1, GHC==8.10.4, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2, GHC==7.2.2, GHC==7.0.4 +tested-with: + GHC==9.2.1, GHC==9.0.1, + GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, + GHC==7.10.3, GHC==7.8.4, GHC==7.6.3 Source-Repository head type: git location: https://github.com/haskell/HTTP.git -Flag mtl1 - description: Use the old mtl version 1. - default: False - Flag warn-as-error default: False description: Build with warnings-as-errors @@ -110,23 +109,26 @@ Library -- note the test harness constraints should be kept in sync with these -- where dependencies are shared - Build-depends: base >= 4.3.0.0 && < 4.17, parsec >= 2.0 && < 3.2 - Build-depends: array >= 0.3.0.2 && < 0.6, bytestring >= 0.9.1.5 && < 0.12 - Build-depends: time >= 1.1.2.3 && < 1.13 + build-depends: + base >= 4.6.0.0 && < 4.18 + , array >= 0.3.0.2 && < 0.6 + , bytestring >= 0.9.1.5 && < 0.12 + , parsec >= 2.0 && < 3.2 + , time >= 1.1.2.3 && < 1.13 + , transformers >= 0.2.0.0 && < 0.7 + -- transformers-0.2.0.0 is the first to have Control.Monad.IO.Class + -- The following dependencies are refined by flags, but they should + -- still be mentioned here on the top-level. + , mtl >= 2.0.0.0 && < 2.4 + , network >= 2.4 && < 3.2 default-language: Haskell98 default-extensions: FlexibleInstances - if flag(mtl1) - Build-depends: mtl >= 1.1.1.0 && < 1.2 - CPP-Options: -DMTL1 - else - Build-depends: mtl >= 2.0 && < 2.3 - if flag(network-uri) - Build-depends: network-uri == 2.6.*, network >= 2.6 && < 3.2 + Build-depends: network-uri == 2.6.*, network >= 2.6 else - Build-depends: network >= 2.4 && < 2.6 + Build-depends: network < 2.6 if flag(warn-as-error) ghc-options: -Werror @@ -147,37 +149,37 @@ Test-Suite test ghc-options: -Wall - -- note: version constraints for dependencies shared with the library - -- should be the same - build-depends: HTTP, - HUnit >= 1.2.0.1 && < 1.7, - httpd-shed >= 0.4 && < 0.5, - mtl >= 1.1.1.0 && < 2.3, - bytestring >= 0.9.1.5 && < 0.12, - deepseq >= 1.3.0.0 && < 1.5, - pureMD5 >= 0.2.4 && < 2.2, - base >= 4.3.0.0 && < 4.16, - split >= 0.1.3 && < 0.3, - test-framework >= 0.2.0 && < 0.9, - test-framework-hunit >= 0.3.0 && <0.4 + build-depends: + HTTP + -- constraints inherited from HTTP + , base + , bytestring + , mtl + , network + -- extra dependencies + , deepseq >= 1.3.0.0 && < 1.5 + , httpd-shed >= 0.4 && < 0.5 + , HUnit >= 1.2.0.1 && < 1.7 + , pureMD5 >= 0.2.4 && < 2.2 + , split >= 0.1.3 && < 0.3 + , test-framework >= 0.2.0 && < 0.9 + , test-framework-hunit >= 0.3.0 && < 0.4 if flag(network-uri) - Build-depends: network-uri == 2.6.*, network >= 2.6 && < 3.2 + Build-depends: network-uri == 2.6.*, network >= 2.6 else - Build-depends: network >= 2.3 && < 2.6 + Build-depends: network < 2.6 if flag(warp-tests) CPP-Options: -DWARP_TESTS build-depends: - case-insensitive >= 0.4.0.1 && < 1.3, - http-types >= 0.8.0 && < 1.0, - wai >= 2.1.0 && < 3.3, - warp >= 2.1.0 && < 3.4 + case-insensitive >= 0.4.0.1 && < 1.3 + , conduit >= 1.0.8 && < 1.4 + , http-types >= 0.8.0 && < 1.0 + , wai >= 2.1.0 && < 3.3 + , warp >= 2.1.0 && < 3.4 if flag(conduit10) - build-depends: - conduit >= 1.0.8 && < 1.1 + build-depends: conduit < 1.1 else - build-depends: - conduit >= 1.1 && < 1.4, - conduit-extra >= 1.1 && < 1.4 + build-depends: conduit >= 1.1, conduit-extra >= 1.1 && < 1.4 diff --git a/ghc-HTTP.spec b/ghc-HTTP.spec index bf43e02..535f236 100644 --- a/ghc-HTTP.spec +++ b/ghc-HTTP.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.9 +# generated by cabal-rpm-2.1.0 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name HTTP @@ -7,11 +7,11 @@ # testsuite missing deps: httpd-shed test-framework test-framework-hunit Name: ghc-%{pkg_name} -Version: 4000.3.16 -Release: 4%{?dist} +Version: 4000.4.1 +Release: 1%{?dist} Summary: A library for client-side HTTP -License: BSD +License: BSD-3-Clause Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz @@ -21,6 +21,16 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros +BuildRequires: ghc-array-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-network-devel +BuildRequires: ghc-network-uri-devel +BuildRequires: ghc-parsec-devel +BuildRequires: ghc-time-devel +BuildRequires: ghc-transformers-devel +%if %{with ghc_prof} BuildRequires: ghc-array-prof BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof @@ -29,6 +39,8 @@ BuildRequires: ghc-network-prof BuildRequires: ghc-network-uri-prof BuildRequires: ghc-parsec-prof BuildRequires: ghc-time-prof +BuildRequires: ghc-transformers-prof +%endif # End cabal-rpm deps %description @@ -126,6 +138,10 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Sun Jan 22 2023 Jens Petersen - 4000.4.1-1 +- https://hackage.haskell.org/package/HTTP-4000.4.1/changelog +- refresh to cabal-rpm-2.1.0 with SPDX migration + * Thu Jul 21 2022 Fedora Release Engineering - 4000.3.16-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index f3b3375..8ce7c9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (HTTP-4000.3.16.tar.gz) = b5136b55967d4db7569a0269b429c8e419878acc548d962af94efa5aa0ddbb8a6ab22bc3096ce3d78b61dc708996c408d4bfa55c6c7fb6c0d915389503cbd755 +SHA512 (HTTP-4000.4.1.tar.gz) = c1edc529032013391263bcc0f8abd9534fc53a617b5033dfdc478318465cd988732b2644c7144979156c62bd1a08b1ace507b4fb4e2806f22ec7696cbdfd0147