From 3a1f76da7bb6d1f3cd58650c2e90d9a17d60cb79 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Jan 2023 01:03:22 +0800 Subject: [PATCH] update to 1.4.2.0 refresh to cabal-rpm-2.1.0 with SPDX migration --- .gitignore | 2 + ghc-hashable.spec | 54 ++++++++++-- hashable-1.3.0.0.cabal | 183 ----------------------------------------- sources | 3 +- 4 files changed, 50 insertions(+), 192 deletions(-) delete mode 100644 hashable-1.3.0.0.cabal diff --git a/.gitignore b/.gitignore index 4ce0fcc..86c8e0b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ /hashable-1.2.6.1.tar.gz /hashable-1.2.7.0.tar.gz /hashable-1.3.0.0.tar.gz +/hashable-1.4.2.0.tar.gz +/data-array-byte-0.1.0.1.tar.gz diff --git a/ghc-hashable.spec b/ghc-hashable.spec index 743710a..9a7fd75 100644 --- a/ghc-hashable.spec +++ b/ghc-hashable.spec @@ -1,30 +1,53 @@ -# generated by cabal-rpm-2.0.9 +# generated by cabal-rpm-2.1.0 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name hashable %global pkgver %{pkg_name}-%{version} +%global dataarraybyte data-array-byte-0.1.0.1 +%global subpkgs %{dataarraybyte} + # testsuite missing deps: test-framework test-framework-hunit test-framework-quickcheck2 Name: ghc-%{pkg_name} -Version: 1.3.0.0 -Release: 9%{?dist} +Version: 1.4.2.0 +# can only be reset when all subpkgs bumped +Release: 1%{?dist} Summary: A class for types that can be converted to a hash value -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 -Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal +Source1: https://hackage.haskell.org/package/%{dataarraybyte}/%{dataarraybyte}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-base-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +#BuildRequires: ghc-data-array-byte-devel +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-filepath-devel +#BuildRequires: ghc-ghc-bignum-devel +BuildRequires: ghc-text-devel +%if %{with ghc_prof} BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +#BuildRequires: ghc-data-array-byte-prof BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-filepath-prof +#BuildRequires: ghc-ghc-bignum-prof BuildRequires: ghc-text-prof +%endif +# for missing dep 'data-array-byte': +BuildRequires: ghc-template-haskell-devel +%if %{with ghc_prof} +BuildRequires: ghc-template-haskell-prof +%endif # End cabal-rpm deps %description @@ -69,21 +92,31 @@ This package provides the Haskell %{pkg_name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage -l BSD-3-Clause %{dataarraybyte} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal +%setup -q -n %{pkgver} -a1 # End cabal-rpm setup %build # Begin cabal-rpm build: +%ghc_libs_build %{subpkgs} %ghc_lib_build # End cabal-rpm build %install # Begin cabal-rpm install +%ghc_libs_install %{subpkgs} %ghc_lib_install # End cabal-rpm install @@ -110,6 +143,11 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Sun Jan 22 2023 Jens Petersen - 1.4.2.0-1 +- https://hackage.haskell.org/package/hashable-1.4.2.0/changelog +- refresh to cabal-rpm-2.1.0 with SPDX migration +- new dep: data-array-byte + * Thu Jul 21 2022 Fedora Release Engineering - 1.3.0.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/hashable-1.3.0.0.cabal b/hashable-1.3.0.0.cabal deleted file mode 100644 index 6df7355..0000000 --- a/hashable-1.3.0.0.cabal +++ /dev/null @@ -1,183 +0,0 @@ -Cabal-version: 1.12 -Name: hashable -Version: 1.3.0.0 -x-revision: 2 -Synopsis: A class for types that can be converted to a hash value -Description: This package defines a class, 'Hashable', for types that - can be converted to a hash value. This class - exists for the benefit of hashing-based data - structures. The package provides instances for - basic types and a way to combine hash values. -Homepage: http://github.com/tibbe/hashable --- SPDX-License-Identifier : BSD-3-Clause -License: BSD3 -License-file: LICENSE -Author: Milan Straka - Johan Tibell -Maintainer: johan.tibell@gmail.com -bug-reports: https://github.com/tibbe/hashable/issues -Stability: Provisional -Category: Data -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 - -Extra-source-files: - CHANGES.md, README.md - -Flag integer-gmp - Description: Are we using @integer-gmp@ to provide fast Integer instances? - Default: True - -Flag sse2 - Description: Do we want to assume that a target supports SSE 2? - Default: True - Manual: True - -Flag sse41 - Description: Do we want to assume that a target supports SSE 4.1? - Default: False - Manual: True - -Flag examples - Description: Build example modules - Default: False - Manual: True - -Library - Exposed-modules: Data.Hashable - Data.Hashable.Lifted - Data.Hashable.Generic - Other-modules: Data.Hashable.Class - Data.Hashable.Generic.Instances - - C-sources: cbits/fnv.c - - Build-depends: base >= 4.5 && < 4.15 - , bytestring >= 0.9 && < 0.12 - , deepseq >= 1.3 && < 1.5 - , text >= 0.12 && < 1.3 - , ghc-prim - - if flag(integer-gmp) - Build-depends: integer-gmp >= 0.4 && < 1.1 - else - -- this is needed for the automatic flag to be well-balanced - Build-depends: integer-simple - - Default-Language: Haskell2010 - Other-Extensions: BangPatterns - CPP - DeriveDataTypeable - FlexibleContexts - FlexibleInstances - GADTs - KindSignatures - MagicHash - MultiParamTypeClasses - ScopedTypeVariables - Trustworthy - TypeOperators - UnliftedFFITypes - - Ghc-options: -Wall -fwarn-tabs - -Test-suite tests - Type: exitcode-stdio-1.0 - Hs-source-dirs: tests - Main-is: Main.hs - Other-modules: Properties Regress - Build-depends: base, - bytestring, - ghc-prim, - hashable, - test-framework >= 0.3.3, - test-framework-hunit, - test-framework-quickcheck2 >= 0.2.9, - HUnit, - QuickCheck >= 2.4.0.1, - random >= 1.0 && < 1.2, - text >= 0.11.0.5 - if !os(windows) - Build-depends: unix - CPP-options: -DHAVE_MMAP - Other-modules: Regress.Mmap - Other-Extensions: CApiFFI - - Ghc-options: -Wall -fno-warn-orphans - Default-Language: Haskell2010 - -benchmark benchmarks - -- We cannot depend on the hashable library directly as that creates - -- a dependency cycle. - hs-source-dirs: . benchmarks - - main-is: Benchmarks.hs - other-modules: - Data.Hashable - Data.Hashable.Class - Data.Hashable.RandomSource - Data.Hashable.SipHash - type: exitcode-stdio-1.0 - - build-depends: - base, - bytestring, - criterion >= 1.0, - ghc-prim, - siphash, - text - - if impl(ghc) - Build-depends: ghc-prim, - text >= 0.11.0.5 - if impl(ghc) && flag(integer-gmp) - Build-depends: integer-gmp >= 0.2 - - if impl(ghc >= 7.2.1) - CPP-Options: -DGENERICS - - include-dirs: - benchmarks/cbits - - includes: - siphash.h - - c-sources: - benchmarks/cbits/inthash.c - benchmarks/cbits/siphash.c - benchmarks/cbits/wang.c - cbits/fnv.c - - if (arch(i386) || arch(x86_64)) && flag(sse2) - cpp-options: -DHAVE_SSE2 - c-sources: - benchmarks/cbits/siphash-sse2.c - - if flag(sse41) - cpp-options: -DHAVE_SSE41 - c-sources: - benchmarks/cbits/siphash-sse41.c - - Ghc-options: -Wall -O2 - if impl(ghc >= 6.8) - Ghc-options: -fwarn-tabs - else - c-sources: cbits/getRandomBytes.c - other-modules: Data.Hashable.RandomSource - if os(windows) - extra-libraries: advapi32 - - Default-Language: Haskell2010 - -Executable hashable-examples - if flag(examples) - build-depends: base, hashable - else - buildable: False - hs-source-dirs: examples - main-is: Main.hs - Default-Language: Haskell2010 - -source-repository head - type: git - location: https://github.com/tibbe/hashable.git diff --git a/sources b/sources index 7cef67b..dca1be0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (hashable-1.3.0.0.tar.gz) = 2ba9b0657ddc6faf8b8be88e79d3c49503dfee3a446fc16bdc851f357afef1b92b443d1582d462cea859e37a16b46ec762b1dcf613458c5a15f800a8fccdb0ac +SHA512 (hashable-1.4.2.0.tar.gz) = 6e44177b6c00d4b385696348a8f66e6158beeb224aa85726141bc4d58c5e3094dab35dd68ae4ef61845ccb3ffd8836547d988d61e9b39176782b567189381140 +SHA512 (data-array-byte-0.1.0.1.tar.gz) = f06e369803fadca57c0782b45c97f914e0e28c512bb3f36be35a06686ac1c3ab45da150143a1be3b0b5633c3d4105570acc4c0482e9692a4ef35568922a303e7