From 29384825d9b3aac8d5f52da78ce6a8544aab58ca Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Jan 2023 01:25:27 +0800 Subject: [PATCH] update to 0.17.0 --- .gitignore | 1 + ghc-memory.spec | 21 +- memory-0.15.0.cabal => memory-0.17.0.cabal | 276 ++++++++++----------- sources | 2 +- 4 files changed, 149 insertions(+), 151 deletions(-) rename memory-0.15.0.cabal => memory-0.17.0.cabal (84%) diff --git a/.gitignore b/.gitignore index 8f4167f..ad9f744 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /memory-0.14.16.tar.gz /memory-0.14.18.tar.gz /memory-0.15.0.tar.gz +/memory-0.17.0.tar.gz diff --git a/ghc-memory.spec b/ghc-memory.spec index d9b3a65..0aae5d4 100644 --- a/ghc-memory.spec +++ b/ghc-memory.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 memory @@ -7,11 +7,11 @@ %bcond_without tests Name: ghc-%{pkg_name} -Version: 0.15.0 -Release: 9%{?dist} +Version: 0.17.0 +Release: 1%{?dist} Summary: Memory and related abstraction stuff -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 @@ -19,12 +19,19 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # End cabal-rpm sources # Begin cabal-rpm deps: +BuildRequires: dos2unix BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros +BuildRequires: ghc-base-devel +BuildRequires: ghc-basement-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-deepseq-devel +%if %{with ghc_prof} BuildRequires: ghc-base-prof BuildRequires: ghc-basement-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-deepseq-prof +%endif %if %{with tests} BuildRequires: ghc-foundation-devel %endif @@ -86,7 +93,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal +dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -130,6 +137,10 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Sun Jan 22 2023 Jens Petersen - 0.17.0-1 +- https://hackage.haskell.org/package/memory-0.17.0/changelog +- refresh to cabal-rpm-2.1.0 with SPDX migration + * Thu Jul 21 2022 Fedora Release Engineering - 0.15.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/memory-0.15.0.cabal b/memory-0.17.0.cabal similarity index 84% rename from memory-0.15.0.cabal rename to memory-0.17.0.cabal index 61b7117..31a28da 100644 --- a/memory-0.15.0.cabal +++ b/memory-0.17.0.cabal @@ -1,145 +1,131 @@ -Name: memory -version: 0.15.0 -x-revision: 2 -Synopsis: memory and related abstraction stuff -Description: - Chunk of memory, polymorphic byte array management and manipulation - . - * A polymorphic byte array abstraction and function similar to strict ByteString. - . - * Different type of byte array abstraction. - . - * Raw memory IO operations (memory set, memory copy, ..) - . - * Aliasing with endianness support. - . - * Encoding : Base16, Base32, Base64. - . - * Hashing : FNV, SipHash -License: BSD3 -License-file: LICENSE -Copyright: Vincent Hanquez -Author: Vincent Hanquez -Maintainer: vincent@snarc.org, Nicolas Di Prima -Category: memory -Stability: experimental -Build-Type: Simple -Homepage: https://github.com/vincenthz/hs-memory -Bug-Reports: https://github.com/vincenthz/hs-memory/issues -cabal-version: 1.18 -extra-doc-files: README.md CHANGELOG.md - -source-repository head - type: git - location: https://github.com/vincenthz/hs-memory - -Flag support_bytestring - Description: add non-orphan bytearray support for bytestring - Default: True - Manual: True - -Flag support_foundation - Description: add support for foundation strings and unboxed array (deprecated use support_basement) - Default: True - Manual: True - -Flag support_basement - Description: add support for foundation strings and unboxed array - Default: True - Manual: True - -Flag support_deepseq - Description: add deepseq instances for memory types - Default: True - Manual: True - -Library - Exposed-modules: Data.ByteArray - Data.ByteArray.Encoding - Data.ByteArray.Mapping - Data.ByteArray.Pack - Data.ByteArray.Parse - Data.ByteArray.Hash - Data.Memory.Endian - Data.Memory.PtrMethods - Data.Memory.ExtendedWords - Data.Memory.Encoding.Base16 - Data.Memory.Encoding.Base32 - Data.Memory.Encoding.Base64 - Other-modules: Data.Memory.Internal.Compat - Data.Memory.Internal.CompatPrim - Data.Memory.Internal.CompatPrim64 - Data.Memory.Internal.DeepSeq - Data.Memory.Internal.Imports - Data.Memory.Internal.Scrubber - Data.Memory.Hash.SipHash - Data.Memory.Hash.FNV - Data.ByteArray.Pack.Internal - Data.ByteArray.Types - Data.ByteArray.Bytes - Data.ByteArray.ScrubbedBytes - Data.ByteArray.Methods - Data.ByteArray.MemView - Data.ByteArray.View - - build-depends: base >= 4.9 && < 4.15 - if impl(ghc < 8.0) - build-depends: base - else - build-depends: base - , ghc-prim - -- FIXME armel or mispel is also little endian. - -- might be a good idea to also add a runtime autodetect mode. - -- ARCH_ENDIAN_UNKNOWN - if (arch(i386) || arch(x86_64)) - CPP-options: -DARCH_IS_LITTLE_ENDIAN - if os(windows) - Other-modules: Data.Memory.MemMap.Windows - else - Other-modules: Data.Memory.MemMap.Posix - - -- optional support bytearray instance for bytestring - if flag(support_bytestring) - CPP-options: -DWITH_BYTESTRING_SUPPORT - Build-depends: bytestring - if flag(support_deepseq) - CPP-options: -DWITH_DEEPSEQ_SUPPORT - Build-depends: deepseq >= 1.1 - if flag(support_foundation) || flag(support_basement) - CPP-options: -DWITH_BASEMENT_SUPPORT - Build-depends: basement >= 0.0.7 - exposed-modules: Data.ByteArray.Sized - - ghc-options: -Wall -fwarn-tabs - default-language: Haskell2010 - -Test-Suite test-memory - type: exitcode-stdio-1.0 - hs-source-dirs: tests - Main-is: Tests.hs - Other-modules: Imports - SipHash - Utils - if impl(ghc < 8.0) - buildable: False - else - build-depends: base - Build-Depends: bytestring - , memory - , basement >= 0.0.7 - , foundation - ghc-options: -Wall -fno-warn-orphans -fno-warn-missing-signatures -threaded - default-language: Haskell2010 - if flag(support_foundation) - CPP-options: -DWITH_BASEMENT_SUPPORT - --- Test-Suite test-examples --- default-language: Haskell2010 --- type: exitcode-stdio-1.0 --- hs-source-dirs: tests --- ghc-options: -threaded --- Main-is: DocTests.hs --- Build-Depends: base >= 3 && < 5 --- , memory --- , bytestring --- , doctest +Name: memory +version: 0.17.0 +x-revision: 1 +Synopsis: memory and related abstraction stuff +Description: + Chunk of memory, polymorphic byte array management and manipulation + . + * A polymorphic byte array abstraction and function similar to strict ByteString. + . + * Different type of byte array abstraction. + . + * Raw memory IO operations (memory set, memory copy, ..) + . + * Aliasing with endianness support. + . + * Encoding : Base16, Base32, Base64. + . + * Hashing : FNV, SipHash +License: BSD3 +License-file: LICENSE +Copyright: Vincent Hanquez +Author: Vincent Hanquez +Maintainer: vincent@snarc.org, Nicolas Di Prima +Category: memory +Stability: experimental +Build-Type: Simple +Homepage: https://github.com/vincenthz/hs-memory +Bug-Reports: https://github.com/vincenthz/hs-memory/issues +cabal-version: 1.18 +extra-doc-files: README.md CHANGELOG.md + +source-repository head + type: git + location: https://github.com/vincenthz/hs-memory + +Flag support_bytestring + Description: add non-orphan bytearray support for bytestring + Default: True + Manual: True + +Flag support_deepseq + Description: add deepseq instances for memory types + Default: True + Manual: True + +Library + Exposed-modules: Data.ByteArray + Data.ByteArray.Encoding + Data.ByteArray.Mapping + Data.ByteArray.Pack + Data.ByteArray.Parse + Data.ByteArray.Hash + Data.Memory.Endian + Data.Memory.PtrMethods + Data.Memory.ExtendedWords + Data.Memory.Encoding.Base16 + Data.Memory.Encoding.Base32 + Data.Memory.Encoding.Base64 + Other-modules: Data.Memory.Internal.Compat + Data.Memory.Internal.CompatPrim + Data.Memory.Internal.CompatPrim64 + Data.Memory.Internal.DeepSeq + Data.Memory.Internal.Imports + Data.Memory.Hash.SipHash + Data.Memory.Hash.FNV + Data.ByteArray.Pack.Internal + Data.ByteArray.Types + Data.ByteArray.Bytes + Data.ByteArray.ScrubbedBytes + Data.ByteArray.Methods + Data.ByteArray.MemView + Data.ByteArray.View + if impl(ghc < 8.0) + buildable: False + else + build-depends: base + , ghc-prim < 0.9 + -- FIXME armel or mispel is also little endian. + -- might be a good idea to also add a runtime autodetect mode. + -- ARCH_ENDIAN_UNKNOWN + if (arch(i386) || arch(x86_64)) + CPP-options: -DARCH_IS_LITTLE_ENDIAN + if os(windows) + Other-modules: Data.Memory.MemMap.Windows + else + Other-modules: Data.Memory.MemMap.Posix + + -- optional support bytearray instance for bytestring + if flag(support_bytestring) + CPP-options: -DWITH_BYTESTRING_SUPPORT + Build-depends: bytestring + if flag(support_deepseq) + CPP-options: -DWITH_DEEPSEQ_SUPPORT + Build-depends: deepseq >= 1.1 + + CPP-options: -DWITH_BASEMENT_SUPPORT + Build-depends: basement >= 0.0.7 + exposed-modules: Data.ByteArray.Sized + + ghc-options: -Wall -fwarn-tabs + default-language: Haskell2010 + +Test-Suite test-memory + type: exitcode-stdio-1.0 + hs-source-dirs: tests + Main-is: Tests.hs + Other-modules: Imports + SipHash + Utils + if impl(ghc < 8.0) + buildable: False + else + build-depends: base + Build-Depends: bytestring + , memory + , basement >= 0.0.7 + , foundation + ghc-options: -Wall -fno-warn-orphans -fno-warn-missing-signatures -threaded + default-language: Haskell2010 + CPP-options: -DWITH_BASEMENT_SUPPORT + +-- Test-Suite test-examples +-- default-language: Haskell2010 +-- type: exitcode-stdio-1.0 +-- hs-source-dirs: tests +-- ghc-options: -threaded +-- Main-is: DocTests.hs +-- Build-Depends: base >= 3 && < 5 +-- , memory +-- , bytestring +-- , doctest diff --git a/sources b/sources index a54018a..f9bddba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (memory-0.15.0.tar.gz) = 49aabf5fdaddae597df6d8f30a3e07c4d6d70fcc7b9146452a4ad4e81858786041676bc780e2b048fd683cc7c0d799d4579596c14fae940ea57954e9a7ee9129 +SHA512 (memory-0.17.0.tar.gz) = ea8175094588680154cb1708a7ecdb6dfba0d29ae102cc2976996d789a4be10c8f106245eeff1d9573cc3e85e4cd5249c2305eeb7a5b14b833f8bed721c27daa