diff --git a/.gitignore b/.gitignore index bd12778..b41e607 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /hackage-security-0.5.2.2.tar.gz /hackage-security-0.5.3.0.tar.gz /hackage-security-0.6.0.1.tar.gz +/hackage-security-0.6.2.1.tar.gz diff --git a/ghc-hackage-security.spec b/ghc-hackage-security.spec index a0bb719..88a601a 100644 --- a/ghc-hackage-security.spec +++ b/ghc-hackage-security.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.9 +# generated by cabal-rpm-2.0.12 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name hackage-security @@ -8,8 +8,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6.0.1 -Release: 7%{?dist} +Version: 0.6.2.1 +Release: 1%{?dist} Summary: Hackage security library License: BSD @@ -18,8 +18,10 @@ Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources +Patch0: hackage-security-0.6.2.1-no-Cabal-syntax.patch # Begin cabal-rpm deps: +BuildRequires: dos2unix BuildRequires: ghc-rpm-macros BuildRequires: ghc-Cabal-prof BuildRequires: ghc-base-prof @@ -49,6 +51,7 @@ BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-hunit-devel BuildRequires: ghc-tasty-quickcheck-devel BuildRequires: ghc-temporary-devel +BuildRequires: ghc-text-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel %endif @@ -107,6 +110,7 @@ This package provides the Haskell %{pkg_name} profiling library. %setup -q -n %{pkgver} cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup +%patch0 -p1 -b .orig %build @@ -149,6 +153,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Tue Jun 07 2022 Jens Petersen - 0.6.2.1-1 +- https://hackage.haskell.org/package/hackage-security-0.6.2.1/changelog + * Thu Mar 10 2022 Jens Petersen - 0.6.0.1-7 - rebuild diff --git a/hackage-security-0.6.2.1-no-Cabal-syntax.patch b/hackage-security-0.6.2.1-no-Cabal-syntax.patch new file mode 100644 index 0000000..4485517 --- /dev/null +++ b/hackage-security-0.6.2.1-no-Cabal-syntax.patch @@ -0,0 +1,12 @@ +--- hackage-security-0.6.2.1/hackage-security.cabal~ 2022-06-07 13:36:36.195520934 +0800 ++++ hackage-security-0.6.2.1/hackage-security.cabal 2022-06-10 17:28:44.922275403 +0800 +@@ -159,8 +159,7 @@ + else + build-depends: Cabal >= 1.14 && < 1.26 + || >= 2.0 && < 2.6 +- || >= 3.0 && < 3.7, +- Cabal-syntax < 3.7 ++ || >= 3.0 && < 3.7 + + hs-source-dirs: src + default-language: Haskell2010 diff --git a/hackage-security-0.6.0.1.cabal b/hackage-security-0.6.2.1.cabal similarity index 89% rename from hackage-security-0.6.0.1.cabal rename to hackage-security-0.6.2.1.cabal index 48fb5cf..c09b3e2 100644 --- a/hackage-security-0.6.0.1.cabal +++ b/hackage-security-0.6.2.1.cabal @@ -1,7 +1,7 @@ cabal-version: 1.12 name: hackage-security -version: 0.6.0.1 -x-revision: 8 +version: 0.6.2.1 +x-revision: 2 synopsis: Hackage security library description: The hackage security library provides both server and @@ -25,14 +25,16 @@ license: BSD3 license-file: LICENSE author: Edsko de Vries maintainer: cabal-devel@haskell.org -copyright: Copyright 2015-2016 Well-Typed LLP +copyright: Copyright 2015-2022 Well-Typed LLP category: Distribution homepage: https://github.com/haskell/hackage-security bug-reports: https://github.com/haskell/hackage-security/issues build-type: Simple -tested-with: GHC==8.10.1, 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 +tested-with: + GHC==9.2.1, GHC==9.0.2, + 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, GHC==7.4.2 extra-source-files: ChangeLog.md @@ -49,6 +51,11 @@ flag use-network-uri description: Are we using @network-uri@? manual: False +flag Cabal-syntax + description: Are we using Cabal-syntax? + manual: False + default: False + flag old-directory description: Use @directory@ < 1.2 and @old-time@ manual: False @@ -109,15 +116,12 @@ library Hackage.Security.Util.Lens Hackage.Security.Util.Stack Hackage.Security.Util.TypedEmbedded - Prelude + MyPrelude -- We support ghc 7.4 (bundled with Cabal 1.14) and up build-depends: base >= 4.5 && < 4.17, base16-bytestring >= 0.1.1 && < 1.1, base64-bytestring >= 1.0 && < 1.3, bytestring >= 0.9 && < 0.12, - Cabal >= 1.14 && < 1.26 - || >= 2.0 && < 2.6 - || >= 3.0 && < 3.8, containers >= 0.4 && < 0.7, ed25519 >= 0.0 && < 0.1, filepath >= 1.2 && < 1.5, @@ -127,8 +131,8 @@ library -- 0.4.2 introduces TarIndex, 0.4.4 introduces more -- functionality, 0.5.0 changes type of serialise tar >= 0.5 && < 0.6, - template-haskell >= 2.7 && < 2.17, - time >= 1.2 && < 1.11, + template-haskell >= 2.7 && < 2.19, + time >= 1.2 && < 1.13, transformers >= 0.3 && < 0.6, zlib >= 0.5 && < 0.7, -- whatever versions are bundled with ghc: @@ -150,6 +154,14 @@ library else build-depends: base >= 4.10 + if flag(Cabal-syntax) + build-depends: Cabal-syntax >= 3.7 && < 3.10 + else + build-depends: Cabal >= 1.14 && < 1.26 + || >= 2.0 && < 2.6 + || >= 3.0 && < 3.7, + Cabal-syntax < 3.7 + hs-source-dirs: src default-language: Haskell2010 default-extensions: DefaultSignatures @@ -162,6 +174,7 @@ library KindSignatures MultiParamTypeClasses NamedFieldPuns + NoImplicitPrelude NoMonomorphismRestriction RankNTypes RecordWildCards @@ -255,15 +268,19 @@ test-suite TestSuite bytestring, network-uri, tar, + text, time, zlib + if flag(Cabal-syntax) + build-depends: Cabal-syntax + -- dependencies exclusive to test-suite - build-depends: tasty == 1.2.* || == 1.3.*, + build-depends: tasty >= 1.2 && < 1.5, tasty-hunit == 0.10.*, tasty-quickcheck == 0.10.*, QuickCheck >= 2.11 && <2.15, - aeson == 1.4.* || == 1.5.*, + aeson == 1.4.* || == 1.5.* || == 2.0.*, vector == 0.12.*, unordered-containers >=0.2.8.0 && <0.3, temporary >= 1.2 && < 1.4 diff --git a/sources b/sources index c267722..c5889f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hackage-security-0.6.0.1.tar.gz) = b83fdda3712c58bcc4237965e40bea16b9ce08f30c0671f45967e69a2eb85488e78a41c8d12b9f339f78f30cc50770a72e9e9a46e5ddf740a20bce4ea4e96fdb +SHA512 (hackage-security-0.6.2.1.tar.gz) = 9d2b10f4ec5a6f095d4790f7b85e38c5477dc1fd7c03088b706c1d83cf8c491c85572db787e8611227ed902639580ddd0523678b3b9136458335d76cd24436bd