From 246a9c31bc35dce0b675e1e41a7732b3333cb512 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Jan 2023 01:45:30 +0800 Subject: [PATCH] update to 0.1.5 refresh to cabal-rpm-2.1.0 with SPDX migration --- .gitignore | 1 + ghc-text-short.spec | 35 ++++++++++-- sources | 2 +- text-short-0.1.3.cabal | 91 ------------------------------- text-short-0.1.5.cabal | 121 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 153 insertions(+), 97 deletions(-) delete mode 100644 text-short-0.1.3.cabal create mode 100644 text-short-0.1.5.cabal diff --git a/.gitignore b/.gitignore index ab0fa98..cb209e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /text-short-0.1.1.tar.gz /text-short-0.1.2.tar.gz /text-short-0.1.3.tar.gz +/text-short-0.1.5.tar.gz diff --git a/ghc-text-short.spec b/ghc-text-short.spec index 903a016..611abfc 100644 --- a/ghc-text-short.spec +++ b/ghc-text-short.spec @@ -1,17 +1,17 @@ -# 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 text-short %global pkgver %{pkg_name}-%{version} -# testsuite missing deps: quickcheck-instances +%bcond_without tests Name: ghc-%{pkg_name} -Version: 0.1.3 -Release: 11%{?dist} +Version: 0.1.5 +Release: 1%{?dist} Summary: Memory-efficient representation of Unicode text strings -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,12 +21,27 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros +BuildRequires: ghc-base-devel +BuildRequires: ghc-binary-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-hashable-devel +BuildRequires: ghc-template-haskell-devel +BuildRequires: ghc-text-devel +%if %{with ghc_prof} BuildRequires: ghc-base-prof BuildRequires: ghc-binary-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-hashable-prof +BuildRequires: ghc-template-haskell-prof BuildRequires: ghc-text-prof +%endif +%if %{with tests} +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel +%endif # End cabal-rpm deps %description @@ -95,6 +110,12 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install +%check +%if %{with tests} +%cabal_test +%endif + + %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -117,6 +138,10 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Sun Jan 22 2023 Jens Petersen - 0.1.5-1 +- https://hackage.haskell.org/package/text-short-0.1.5/changelog +- refresh to cabal-rpm-2.1.0 with SPDX migration + * Thu Jul 21 2022 Fedora Release Engineering - 0.1.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 6d4be68..095f408 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (text-short-0.1.3.tar.gz) = 6d7a5379dbaf28a201dd44229959a293acb5ff57c4659a6a34af37e46b2e6fc5eb61a00ba26d36dd08795456246429ec20236af8e342fd0d03bfcf6d06d69428 +SHA512 (text-short-0.1.5.tar.gz) = 32f09a1abc37ddb3f85921d80629355f68b2e68531f14318907e792a8eeb7d4a258bfcf7d45710dcb67f85fadfbad2bb9ffdac27a912aefc4296dc1818585125 diff --git a/text-short-0.1.3.cabal b/text-short-0.1.3.cabal deleted file mode 100644 index 9f24e4f..0000000 --- a/text-short-0.1.3.cabal +++ /dev/null @@ -1,91 +0,0 @@ -cabal-version: 1.18 - -name: text-short -version: 0.1.3 -x-revision: 3 -synopsis: Memory-efficient representation of Unicode text strings -license: BSD3 -license-file: LICENSE -author: Herbert Valerio Riedel -maintainer: hvr@gnu.org -bug-reports: https://github.com/hvr/text-short/issues -category: Data -build-type: Simple -description: This package provides the 'ShortText' type which is suitable for keeping many short strings in memory. This is similiar to how 'ShortByteString' relates to 'ByteString'. - . - The main difference between 'Text' and 'ShortText' is that 'ShortText' uses UTF-8 instead of UTF-16 internally and also doesn't support zero-copy slicing (thereby saving 2 words). Consequently, the memory footprint of a (boxed) 'ShortText' value is 4 words (2 words when unboxed) plus the length of the UTF-8 encoded payload. - -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 -extra-source-files: ChangeLog.md - -Source-Repository head - Type: git - Location: https://github.com/hvr/text-short.git - -flag asserts - description: Enable runtime-checks via @assert@ - default: False - manual: True - -library - exposed-modules: Data.Text.Short - Data.Text.Short.Partial - Data.Text.Short.Unsafe - - other-modules: Data.Text.Short.Internal - - build-depends: base >= 4.7 && < 4.16 - , bytestring >= 0.10.4 && < 0.12 - , hashable >= 1.2.6 && < 1.4 - , deepseq >= 1.3 && < 1.5 - , text >= 1.0 && < 1.3 - , binary >= 0.7.1 && < 0.9 - , ghc-prim >= 0.3.1 && < 0.8 - - if !impl(ghc >= 8.0) - build-depends: semigroups >= 0.18.2 && < 0.20 - - -- GHC version specific PrimOps - if impl(ghc >= 8.4) - hs-source-dirs: src-ghc804 - else - c-sources: cbits/memcmp.c - hs-source-dirs: src-ghc708 - other-modules: PrimOps - - hs-source-dirs: src - - default-language: Haskell2010 - other-extensions: CPP - , GeneralizedNewtypeDeriving - , MagicHash - , UnliftedFFITypes - , Trustworthy - , Unsafe - - c-sources: cbits/cbits.c - - if flag(asserts) - ghc-options: -fno-ignore-asserts - else - cc-options: -DNDEBUG=1 - - ghc-options: -Wall - cc-options: -O3 -Wall - -test-suite tests - type: exitcode-stdio-1.0 - hs-source-dirs: src-test - main-is: Tests.hs - - build-depends: base - , binary - , text - , text-short - -- deps which don't inherit constraints from library stanza: - , tasty >= 1.0.0 && < 1.3 - , tasty-quickcheck >= 0.10 && < 0.11 - , tasty-hunit >= 0.10.0 && < 0.11 - , quickcheck-instances >= 0.3.14 && < 0.4 - - default-language: Haskell2010 diff --git a/text-short-0.1.5.cabal b/text-short-0.1.5.cabal new file mode 100644 index 0000000..2665c8e --- /dev/null +++ b/text-short-0.1.5.cabal @@ -0,0 +1,121 @@ +cabal-version: 1.18 +name: text-short +version: 0.1.5 +x-revision: 1 +synopsis: Memory-efficient representation of Unicode text strings +license: BSD3 +license-file: LICENSE +author: Herbert Valerio Riedel +maintainer: hvr@gnu.org +bug-reports: https://github.com/hvr/text-short/issues +category: Data +build-type: Simple +description: + This package provides the 'ShortText' type which is suitable for keeping many short strings in memory. This is similiar to how 'ShortByteString' relates to 'ByteString'. + . + The main difference between 'Text' and 'ShortText' is that 'ShortText' uses UTF-8 instead of UTF-16 internally and also doesn't support zero-copy slicing (thereby saving 2 words). Consequently, the memory footprint of a (boxed) 'ShortText' value is 4 words (2 words when unboxed) plus the length of the UTF-8 encoded payload. + +tested-with: + GHC ==7.8.4 + || ==7.10.3 + || ==8.0.2 + || ==8.2.2 + || ==8.4.4 + || ==8.6.5 + || ==8.8.3 + || ==8.10.7 + || ==9.0.2 + || ==9.2.4 + || ==9.4.2 + +extra-source-files: ChangeLog.md + +source-repository head + type: git + location: https://github.com/hvr/text-short.git + +flag asserts + description: Enable runtime-checks via @assert@ + default: False + manual: True + +library + exposed-modules: + Data.Text.Short + Data.Text.Short.Partial + Data.Text.Short.Unsafe + + other-modules: Data.Text.Short.Internal + build-depends: + base >=4.7 && <4.18 + , binary >=0.7.1 && <0.9 + , bytestring >=0.10.4 && <0.12 + , deepseq >=1.3 && <1.5 + , ghc-prim >=0.3.1 && <0.10 + , hashable >=1.2.6 && <1.5 + , template-haskell >=2.9.0.0 && <2.20 + , text >=1.0 && <1.3 || >=2.0 && <2.1 + + if impl(ghc >=8.0) + build-depends: bytestring >=0.10.8.0 + + if !impl(ghc >=8.0) + build-depends: semigroups >=0.18.2 && <0.21 + + -- GHC version specific PrimOps + if impl(ghc >=8.4) + hs-source-dirs: src-ghc804 + + else + c-sources: cbits/memcmp.c + hs-source-dirs: src-ghc708 + + other-modules: PrimOps + hs-source-dirs: src + default-language: Haskell2010 + other-extensions: + CPP + GeneralizedNewtypeDeriving + MagicHash + Trustworthy + UnliftedFFITypes + Unsafe + + if impl(ghc >=8) + other-extensions: TemplateHaskellQuotes + + else + other-extensions: TemplateHaskell + + c-sources: cbits/cbits.c + + if flag(asserts) + ghc-options: -fno-ignore-asserts + + else + cc-options: -DNDEBUG=1 + + ghc-options: -Wall + cc-options: -Wall + +test-suite tests + type: exitcode-stdio-1.0 + hs-source-dirs: src-test + main-is: Tests.hs + + -- bytestring dependency for cabal_macros.h + build-depends: + base + , binary + , bytestring + , template-haskell + , text + , text-short + + -- deps which don't inherit constraints from library stanza: + build-depends: + tasty >=1.4 && <1.5 + , tasty-hunit >=0.10.0 && <0.11 + , tasty-quickcheck >=0.10 && <0.11 + + default-language: Haskell2010