From 06572a32e2a51e8cfa5d0651e85a16e0cd9e15ecd3ea8b463babdaf4b1df055c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:41 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-base16-bytestring revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-base16-bytestring?expand=0&rev=43 --- base16-bytestring-0.1.1.7.tar.gz | 3 -- base16-bytestring-1.0.1.0.tar.gz | 3 ++ base16-bytestring.cabal | 54 -------------------------------- ghc-base16-bytestring.changes | 27 ++++++++++++++++ ghc-base16-bytestring.spec | 28 ++++++++++++----- 5 files changed, 51 insertions(+), 64 deletions(-) delete mode 100644 base16-bytestring-0.1.1.7.tar.gz create mode 100644 base16-bytestring-1.0.1.0.tar.gz delete mode 100644 base16-bytestring.cabal diff --git a/base16-bytestring-0.1.1.7.tar.gz b/base16-bytestring-0.1.1.7.tar.gz deleted file mode 100644 index 91cd373..0000000 --- a/base16-bytestring-0.1.1.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:525689679d5cc80fa532c1d5cfeace0f62bbb54134fad514f1ba00d0e7fe69ba -size 5136 diff --git a/base16-bytestring-1.0.1.0.tar.gz b/base16-bytestring-1.0.1.0.tar.gz new file mode 100644 index 0000000..38e2771 --- /dev/null +++ b/base16-bytestring-1.0.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0c70a4b58be53d36971bd7361ba300f82a5d5ebf7f50e1a2d7bfc8838bdd6fa +size 7256 diff --git a/base16-bytestring.cabal b/base16-bytestring.cabal deleted file mode 100644 index 8cf5ae1..0000000 --- a/base16-bytestring.cabal +++ /dev/null @@ -1,54 +0,0 @@ -cabal-version: 1.12 -name: base16-bytestring -version: 0.1.1.7 -x-revision: 3 -synopsis: Fast base16 (hex) encoding and decoding for ByteStrings -description: This package provides support for encoding and decoding binary data according - to @base16@ (see also ) for - strict (see "Data.ByteString.Base16") and lazy @ByteString@s (see "Data.ByteString.Base16.Lazy"). - . - See also the package which - provides an uniform API providing conversion paths between more binary and textual types. -homepage: http://github.com/haskell/base16-bytestring -bug-reports: http://github.com/haskell/base16-bytestring/issues -license: BSD3 -license-file: LICENSE -copyright: Copyright 2011 MailRank, Inc.; - Copyright 2010-2020 Bryan O'Sullivan et al. -author: Bryan O'Sullivan -maintainer: Herbert Valerio Riedel , - Mikhail Glushenkov , - Emily Pillmore -category: Data -build-type: Simple -extra-source-files: README.md CHANGELOG.md -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, GHC==7.2.2, GHC==7.0.4 - -library - exposed-modules: - Data.ByteString.Base16 - Data.ByteString.Base16.Lazy - - build-depends: - base == 4.*, - bytestring >= 0.9 && < 0.11, - ghc-prim - - ghc-options: -Wall -funbox-strict-fields - default-language: Haskell2010 - -source-repository head - type: git - location: http://github.com/haskell/base16-bytestring - -test-suite test - type: exitcode-stdio-1.0 - hs-source-dirs: tests - main-is: Tests.hs - default-language: Haskell2010 - build-depends: base - , base16-bytestring - , bytestring diff --git a/ghc-base16-bytestring.changes b/ghc-base16-bytestring.changes index 0a5aacf..4f95f7c 100644 --- a/ghc-base16-bytestring.changes +++ b/ghc-base16-bytestring.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + +------------------------------------------------------------------- +Wed Dec 9 11:28:16 UTC 2020 - psimons@suse.com + +- Update base16-bytestring to version 1.0.1.0. + # 1.0.1.0 + + * Backwards-compatible support for `bytestring ^>= 0.11` ([#15](https://github.com/haskell/base16-bytestring/pull/15)) + + # 1.0.0.0 + + * Merged omnibus PR doing a variety of things in ([#10](https://github.com/haskell/base16-bytestring/pull/10)): + - Improves performance by 3-4x for encode, 4-5x for decode. + - The `decode` signature returning the tuple and actually returns an error message with offset. The signature will now be `ByteString -> Either String ByteString`. + - Actually tests using the test vectors defined in the RFC, and uses property tests to ensure invariants hold. + - Adds lenient decoders to the API + - Adds `-XTrustworthy` annotations to the relevant exposed modules + - Rewrites the haddocks to be more up to date and fancy-styled. + - Adds benchmarks to the `.cabal` file so they can be run at toplevel, and make them better. + - Bumps the Cabal version to 1.12 + + Because of the breadth of this change, we are calling this a new epoch for the `base16-bytestring` library. Hence, the version `1.0.0.0`. + ------------------------------------------------------------------- Tue Sep 22 09:33:51 UTC 2020 - psimons@suse.com diff --git a/ghc-base16-bytestring.spec b/ghc-base16-bytestring.spec index 155a7c9..83b83f6 100644 --- a/ghc-base16-bytestring.spec +++ b/ghc-base16-bytestring.spec @@ -19,16 +19,28 @@ %global pkg_name base16-bytestring %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.1.1.7 +Version: 1.0.1.0 Release: 0 -Summary: Fast base16 (hex) encoding and decoding for ByteStrings +Summary: RFC 4648-compliant Base16 encodings for ByteStrings License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/3.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros +# GHC dont support i586 +%ifarch %{ix86} +ExclusiveArch: i586 i686 +ExclusiveArch: i686 +%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} +%endif +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif %description This package provides support for encoding and decoding binary data according @@ -36,9 +48,12 @@ to 'base16' (see also ) for strict (see "Data.ByteString.Base16") and lazy 'ByteString's (see "Data.ByteString.Base16.Lazy"). -See also the -package which provides an uniform API providing conversion paths between more -binary and textual types. +See the package which +provides superior encoding and decoding performance as well as support for +lazy, short, and strict variants of 'Text' and 'ByteString' values. +Additionally, see the package which provides an uniform API providing conversion paths +between more binary and textual types. %package devel Summary: Haskell %{pkg_name} library development files @@ -53,7 +68,6 @@ files. %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build From e8832e538082847ac3716197c8f304bc8169684da22460ad3612a8068fdf9d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:37 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-base16-bytestring revision:15, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-base16-bytestring?expand=0&rev=44 --- ghc-base16-bytestring.changes | 2 +- ghc-base16-bytestring.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-base16-bytestring.changes b/ghc-base16-bytestring.changes index 4f95f7c..ecfa236 100644 --- a/ghc-base16-bytestring.changes +++ b/ghc-base16-bytestring.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup -- force i686 arch on i586 +- disable %{ix86} build ------------------------------------------------------------------- Wed Dec 9 11:28:16 UTC 2020 - psimons@suse.com diff --git a/ghc-base16-bytestring.spec b/ghc-base16-bytestring.spec index 83b83f6..d0e02e4 100644 --- a/ghc-base16-bytestring.spec +++ b/ghc-base16-bytestring.spec @@ -28,12 +28,7 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros -# GHC dont support i586 -%ifarch %{ix86} -ExclusiveArch: i586 i686 -ExclusiveArch: i686 -%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} -%endif +ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel From c2a5097a3b7e880b7fe1798d76d82715c0413ab5c2e0442ab5001cd6a58ff287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:03 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-base16-bytestring revision:16, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-base16-bytestring?expand=0&rev=45 --- ghc-base16-bytestring.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-base16-bytestring.changes b/ghc-base16-bytestring.changes index ecfa236..2449c8d 100644 --- a/ghc-base16-bytestring.changes +++ b/ghc-base16-bytestring.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup +Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup - disable %{ix86} build