From bdf72a891fda8e1a5d0e1e95d112650888b95512 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 24 Jan 2023 23:54:56 +0800 Subject: [PATCH] refresh to cabal-rpm-2.1.0 with SPDX migration --- aeson-compat-0.3.10.cabal | 17 +++++++++-------- ghc-aeson-compat.spec | 27 ++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/aeson-compat-0.3.10.cabal b/aeson-compat-0.3.10.cabal index 9f29ad4..71d4318 100644 --- a/aeson-compat-0.3.10.cabal +++ b/aeson-compat-0.3.10.cabal @@ -1,6 +1,6 @@ name: aeson-compat version: 0.3.10 -x-revision: 2 +x-revision: 4 synopsis: Compatibility layer for aeson description: Compatibility layer for @aeson@ category: Web @@ -21,9 +21,10 @@ tested-with: || ==8.4.4 || ==8.6.5 || ==8.8.4 - || ==8.10.4 - || ==9.0.1 - || ==9.2.1 + || ==8.10.7 + || ==9.0.2 + || ==9.2.4 + || ==9.4.1 extra-source-files: CHANGELOG.md @@ -37,10 +38,10 @@ library hs-source-dirs: src ghc-options: -Wall build-depends: - aeson >=0.7.0.6 && <1.6 || >=2.0.0.0 && <2.1 + aeson >=0.7.0.6 && <1.6 || >=2.0.0.0 && <2.2 , attoparsec >=0.12 && <0.15 - , attoparsec-iso8601 >=1.0.0.0 && <1.1 - , base >=4.6 && <4.17 + , attoparsec-iso8601 >=1.0.0.0 && <1.2 + , base >=4.6 && <4.18 , base-compat >=0.6.0 && <0.13 , bytestring >=0.10 && <0.12 , containers >=0.5 && <0.7 @@ -52,7 +53,7 @@ library , time >=1.4.0.1 && <1.13 , time-locale-compat >=0.1.0.1 && <0.2 , unordered-containers >=0.2 && <0.3 - , vector >=0.10 && <0.13 + , vector >=0.10 && <0.14 if !impl(ghc >=8.0) build-depends: semigroups >=0.18.5 && <0.21 diff --git a/ghc-aeson-compat.spec b/ghc-aeson-compat.spec index 36891d9..95d2219 100644 --- a/ghc-aeson-compat.spec +++ b/ghc-aeson-compat.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 aeson-compat @@ -8,10 +8,10 @@ Name: ghc-%{pkg_name} Version: 0.3.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compatibility layer for aeson -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,23 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-attoparsec-iso8601-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-compat-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-exceptions-devel +BuildRequires: ghc-hashable-devel +BuildRequires: ghc-scientific-devel +BuildRequires: ghc-tagged-devel +BuildRequires: ghc-text-devel +BuildRequires: ghc-time-devel +BuildRequires: ghc-time-locale-compat-devel +BuildRequires: ghc-unordered-containers-devel +BuildRequires: ghc-vector-devel +%if %{with ghc_prof} BuildRequires: ghc-aeson-prof BuildRequires: ghc-attoparsec-prof BuildRequires: ghc-attoparsec-iso8601-prof @@ -37,6 +54,7 @@ BuildRequires: ghc-time-prof BuildRequires: ghc-time-locale-compat-prof BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-vector-prof +%endif # End cabal-rpm deps %description @@ -119,6 +137,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Feb 16 2023 Jens Petersen - 0.3.10-3 +- refresh to cabal-rpm-2.1.0 with SPDX migration + * Thu Jul 21 2022 Fedora Release Engineering - 0.3.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild