From 3c8652dbb134dcc9c6f6f79b186a7d8174efecf74a54ed3d7128b8e64bbd464c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Sep 2020 01:01:23 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hashtables revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hashtables?expand=0&rev=5 --- ghc-hashtables.changes | 9 +++++++++ ghc-hashtables.spec | 14 +++++++++++++- hashtables-1.2.3.4.tar.gz | 3 --- hashtables-1.2.4.0.tar.gz | 3 +++ 4 files changed, 25 insertions(+), 4 deletions(-) delete mode 100644 hashtables-1.2.3.4.tar.gz create mode 100644 hashtables-1.2.4.0.tar.gz diff --git a/ghc-hashtables.changes b/ghc-hashtables.changes index cbedbfe..5f39964 100644 --- a/ghc-hashtables.changes +++ b/ghc-hashtables.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Sep 8 02:00:37 UTC 2020 - psimons@suse.com + +- Update hashtables to version 1.2.4.0. + ## 1.2.4.0 + + Fix a [correctness bug](https://github.com/gregorycollins/hashtables/issues/55) + with cuckoo hash tables and the new `mutate` function introduced in 1.2.3.0. + ------------------------------------------------------------------- Tue Aug 18 10:44:58 UTC 2020 - Peter Simons diff --git a/ghc-hashtables.spec b/ghc-hashtables.spec index e54afe1..3171345 100644 --- a/ghc-hashtables.spec +++ b/ghc-hashtables.spec @@ -17,8 +17,9 @@ %global pkg_name hashtables +%bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.3.4 +Version: 1.2.4.0 Release: 0 Summary: Mutable hash tables in the ST monad License: BSD-3-Clause @@ -29,6 +30,14 @@ BuildRequires: ghc-hashable-devel BuildRequires: ghc-primitive-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-vector-devel +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-mwc-random-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif %description This package provides a couple of different implementations of mutable hash @@ -123,6 +132,9 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install +%check +%cabal_test + %post devel %ghc_pkg_recache diff --git a/hashtables-1.2.3.4.tar.gz b/hashtables-1.2.3.4.tar.gz deleted file mode 100644 index f728834..0000000 --- a/hashtables-1.2.3.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:125ce62701fba3f666609f5c75f452005aa5d32dff4eeee3f3903c30b2ed55e6 -size 58458 diff --git a/hashtables-1.2.4.0.tar.gz b/hashtables-1.2.4.0.tar.gz new file mode 100644 index 0000000..b97e4eb --- /dev/null +++ b/hashtables-1.2.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:787ff5a24e184467b2b6d1fa5d34d5ffb548d45c8b3c644ed1dfdd9368c5a75e +size 58393 From 59f17fa17ca0c5fed31f38c74e559d4c2121f380339ea5e7fa7351288d1dbd6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Sep 2020 16:13:59 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hashtables revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hashtables?expand=0&rev=6 --- ghc-hashtables.changes | 9 +++++++++ ghc-hashtables.spec | 2 +- hashtables-1.2.4.0.tar.gz | 3 --- hashtables-1.2.4.1.tar.gz | 3 +++ 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 hashtables-1.2.4.0.tar.gz create mode 100644 hashtables-1.2.4.1.tar.gz diff --git a/ghc-hashtables.changes b/ghc-hashtables.changes index 5f39964..ccc4011 100644 --- a/ghc-hashtables.changes +++ b/ghc-hashtables.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Sep 9 02:00:37 UTC 2020 - psimons@suse.com + +- Update hashtables to version 1.2.4.1. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/hashtables-1.2.4.1/src/changelog.md + ------------------------------------------------------------------- Tue Sep 8 02:00:37 UTC 2020 - psimons@suse.com diff --git a/ghc-hashtables.spec b/ghc-hashtables.spec index 3171345..f0ef656 100644 --- a/ghc-hashtables.spec +++ b/ghc-hashtables.spec @@ -19,7 +19,7 @@ %global pkg_name hashtables %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.4.0 +Version: 1.2.4.1 Release: 0 Summary: Mutable hash tables in the ST monad License: BSD-3-Clause diff --git a/hashtables-1.2.4.0.tar.gz b/hashtables-1.2.4.0.tar.gz deleted file mode 100644 index b97e4eb..0000000 --- a/hashtables-1.2.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:787ff5a24e184467b2b6d1fa5d34d5ffb548d45c8b3c644ed1dfdd9368c5a75e -size 58393 diff --git a/hashtables-1.2.4.1.tar.gz b/hashtables-1.2.4.1.tar.gz new file mode 100644 index 0000000..4e2dd96 --- /dev/null +++ b/hashtables-1.2.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ac3bf86030eeb1dd0f3d0cd1967cb610ee9564251622371fda560bc4e7def6d +size 58425