From 733898a7b7fd0dbfed5cc18c6e2f6a674231ba34cbe8872c706d736e30f1450b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2023 13:42:07 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-tasty revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tasty?expand=0&rev=11 --- ghc-tasty.changes | 9 +++++ ghc-tasty.spec | 10 ++---- tasty-1.3.1.tar.gz | 3 -- tasty-1.4.3.tar.gz | 3 ++ tasty.cabal | 90 ---------------------------------------------- 5 files changed, 14 insertions(+), 101 deletions(-) delete mode 100644 tasty-1.3.1.tar.gz create mode 100644 tasty-1.4.3.tar.gz delete mode 100644 tasty.cabal diff --git a/ghc-tasty.changes b/ghc-tasty.changes index 70abaf9..ebbd868 100644 --- a/ghc-tasty.changes +++ b/ghc-tasty.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Dec 18 21:32:26 UTC 2022 - Peter Simons + +- Update tasty to version 1.4.3. + 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/tasty-1.4.3/src/CHANGELOG.md + ------------------------------------------------------------------- Sat May 7 21:32:12 UTC 2022 - Peter Simons diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 89fa208..6f12082 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -18,26 +18,21 @@ %global pkg_name tasty Name: ghc-%{pkg_name} -Version: 1.3.1 +Version: 1.4.3 Release: 0 Summary: Modern and extensible testing framework License: MIT 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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-ansi-terminal-devel -BuildRequires: ghc-async-devel -BuildRequires: ghc-clock-devel BuildRequires: ghc-containers-devel -BuildRequires: ghc-mtl-devel BuildRequires: ghc-optparse-applicative-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-stm-devel BuildRequires: ghc-tagged-devel -BuildRequires: ghc-unbounded-delays-devel +BuildRequires: ghc-transformers-devel BuildRequires: ghc-unix-devel -BuildRequires: ghc-wcwidth-devel ExcludeArch: %{ix86} %description @@ -57,7 +52,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/tasty-1.3.1.tar.gz b/tasty-1.3.1.tar.gz deleted file mode 100644 index 6c32d15..0000000 --- a/tasty-1.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cd5dff4a13527dfd9460134ae168a55c821e5bb9aece7ad9d00a1d03cc014dd -size 52190 diff --git a/tasty-1.4.3.tar.gz b/tasty-1.4.3.tar.gz new file mode 100644 index 0000000..25050b7 --- /dev/null +++ b/tasty-1.4.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f420da9560267271dce8a0007a1cb77c06987f0d129eb0f613110ce61f71cb00 +size 58726 diff --git a/tasty.cabal b/tasty.cabal deleted file mode 100644 index 054e010..0000000 --- a/tasty.cabal +++ /dev/null @@ -1,90 +0,0 @@ --- Initial tasty.cabal generated by cabal init. For further documentation, --- see http://haskell.org/cabal/users-guide/ - -name: tasty -version: 1.3.1 -x-revision: 1 -synopsis: Modern and extensible testing framework -description: Tasty is a modern testing framework for Haskell. - It lets you combine your unit tests, golden - tests, QuickCheck/SmallCheck properties, and any - other types of tests into a single test suite. -license: MIT -license-file: LICENSE -author: Roman Cheplyaka -maintainer: Roman Cheplyaka -homepage: https://github.com/feuerbach/tasty -bug-reports: https://github.com/feuerbach/tasty/issues --- copyright: -category: Testing -build-type: Simple -extra-source-files: CHANGELOG.md, README.md -cabal-version: >=1.10 - -Source-repository head - type: git - location: git://github.com/feuerbach/tasty.git - subdir: core - -flag clock - description: - Depend on the clock package for more accurate time measurement - default: True - -library - build-depends: mtl <2.3 - - exposed-modules: - Test.Tasty, - Test.Tasty.Options, - Test.Tasty.Providers, - Test.Tasty.Providers.ConsoleFormat, - Test.Tasty.Runners - Test.Tasty.Ingredients, - Test.Tasty.Ingredients.Basic - Test.Tasty.Ingredients.ConsoleReporter - - -- for testing only - Test.Tasty.Patterns.Types - Test.Tasty.Patterns.Parser - Test.Tasty.Patterns.Eval - other-modules: - Test.Tasty.Parallel, - Test.Tasty.Core, - Test.Tasty.Options.Core, - Test.Tasty.Options.Env, - Test.Tasty.Patterns, - Test.Tasty.Patterns.Expr, - Test.Tasty.Run, - Test.Tasty.Runners.Reducers, - Test.Tasty.Runners.Utils, - Test.Tasty.CmdLine, - Test.Tasty.Ingredients.ListTests - Test.Tasty.Ingredients.IncludingOptions - build-depends: - base >= 4.7 && < 5, - stm >= 2.3, - containers, - mtl >= 2.1.3.1, - tagged >= 0.5, - optparse-applicative >= 0.14, - unbounded-delays >= 0.1, - async >= 2.0, - ansi-terminal >= 0.9 - if(!impl(ghc >= 8.0)) - build-depends: semigroups - - if flag(clock) - build-depends: clock >= 0.4.4.0 - else - build-depends: time >= 1.4 - - if !os(windows) && !impl(ghcjs) - build-depends: unix, - wcwidth - cpp-options: -D__UNIX__ - - -- hs-source-dirs: - default-language: Haskell2010 - default-extensions: CPP, ScopedTypeVariables, DeriveDataTypeable - ghc-options: -Wall From c9da0572131d66bd097b56ca812547122d5ea983b6c47fa6cc46e8c223b4f5a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Feb 2023 09:19:03 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-tasty revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tasty?expand=0&rev=12 --- ghc-tasty.changes | 9 ----- ghc-tasty.spec | 10 ++++-- tasty-1.3.1.tar.gz | 3 ++ tasty-1.4.3.tar.gz | 3 -- tasty.cabal | 90 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 101 insertions(+), 14 deletions(-) create mode 100644 tasty-1.3.1.tar.gz delete mode 100644 tasty-1.4.3.tar.gz create mode 100644 tasty.cabal diff --git a/ghc-tasty.changes b/ghc-tasty.changes index ebbd868..70abaf9 100644 --- a/ghc-tasty.changes +++ b/ghc-tasty.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Sun Dec 18 21:32:26 UTC 2022 - Peter Simons - -- Update tasty to version 1.4.3. - 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/tasty-1.4.3/src/CHANGELOG.md - ------------------------------------------------------------------- Sat May 7 21:32:12 UTC 2022 - Peter Simons diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 6f12082..89fa208 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -18,21 +18,26 @@ %global pkg_name tasty Name: ghc-%{pkg_name} -Version: 1.4.3 +Version: 1.3.1 Release: 0 Summary: Modern and extensible testing framework License: MIT 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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-ansi-terminal-devel +BuildRequires: ghc-async-devel +BuildRequires: ghc-clock-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-mtl-devel BuildRequires: ghc-optparse-applicative-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-stm-devel BuildRequires: ghc-tagged-devel -BuildRequires: ghc-transformers-devel +BuildRequires: ghc-unbounded-delays-devel BuildRequires: ghc-unix-devel +BuildRequires: ghc-wcwidth-devel ExcludeArch: %{ix86} %description @@ -52,6 +57,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/tasty-1.3.1.tar.gz b/tasty-1.3.1.tar.gz new file mode 100644 index 0000000..6c32d15 --- /dev/null +++ b/tasty-1.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cd5dff4a13527dfd9460134ae168a55c821e5bb9aece7ad9d00a1d03cc014dd +size 52190 diff --git a/tasty-1.4.3.tar.gz b/tasty-1.4.3.tar.gz deleted file mode 100644 index 25050b7..0000000 --- a/tasty-1.4.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f420da9560267271dce8a0007a1cb77c06987f0d129eb0f613110ce61f71cb00 -size 58726 diff --git a/tasty.cabal b/tasty.cabal new file mode 100644 index 0000000..054e010 --- /dev/null +++ b/tasty.cabal @@ -0,0 +1,90 @@ +-- Initial tasty.cabal generated by cabal init. For further documentation, +-- see http://haskell.org/cabal/users-guide/ + +name: tasty +version: 1.3.1 +x-revision: 1 +synopsis: Modern and extensible testing framework +description: Tasty is a modern testing framework for Haskell. + It lets you combine your unit tests, golden + tests, QuickCheck/SmallCheck properties, and any + other types of tests into a single test suite. +license: MIT +license-file: LICENSE +author: Roman Cheplyaka +maintainer: Roman Cheplyaka +homepage: https://github.com/feuerbach/tasty +bug-reports: https://github.com/feuerbach/tasty/issues +-- copyright: +category: Testing +build-type: Simple +extra-source-files: CHANGELOG.md, README.md +cabal-version: >=1.10 + +Source-repository head + type: git + location: git://github.com/feuerbach/tasty.git + subdir: core + +flag clock + description: + Depend on the clock package for more accurate time measurement + default: True + +library + build-depends: mtl <2.3 + + exposed-modules: + Test.Tasty, + Test.Tasty.Options, + Test.Tasty.Providers, + Test.Tasty.Providers.ConsoleFormat, + Test.Tasty.Runners + Test.Tasty.Ingredients, + Test.Tasty.Ingredients.Basic + Test.Tasty.Ingredients.ConsoleReporter + + -- for testing only + Test.Tasty.Patterns.Types + Test.Tasty.Patterns.Parser + Test.Tasty.Patterns.Eval + other-modules: + Test.Tasty.Parallel, + Test.Tasty.Core, + Test.Tasty.Options.Core, + Test.Tasty.Options.Env, + Test.Tasty.Patterns, + Test.Tasty.Patterns.Expr, + Test.Tasty.Run, + Test.Tasty.Runners.Reducers, + Test.Tasty.Runners.Utils, + Test.Tasty.CmdLine, + Test.Tasty.Ingredients.ListTests + Test.Tasty.Ingredients.IncludingOptions + build-depends: + base >= 4.7 && < 5, + stm >= 2.3, + containers, + mtl >= 2.1.3.1, + tagged >= 0.5, + optparse-applicative >= 0.14, + unbounded-delays >= 0.1, + async >= 2.0, + ansi-terminal >= 0.9 + if(!impl(ghc >= 8.0)) + build-depends: semigroups + + if flag(clock) + build-depends: clock >= 0.4.4.0 + else + build-depends: time >= 1.4 + + if !os(windows) && !impl(ghcjs) + build-depends: unix, + wcwidth + cpp-options: -D__UNIX__ + + -- hs-source-dirs: + default-language: Haskell2010 + default-extensions: CPP, ScopedTypeVariables, DeriveDataTypeable + ghc-options: -Wall From 41a18e0e56c4aadf3e0267099ba9177b01e2e334dee66c01adc1925c79b661a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 08:26:49 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-tasty revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tasty?expand=0&rev=13 --- ghc-tasty.changes | 9 +++++ ghc-tasty.spec | 41 ++++++++++++++++----- tasty-1.3.1.tar.gz | 3 -- tasty-1.4.3.tar.gz | 3 ++ tasty.cabal | 90 ---------------------------------------------- 5 files changed, 45 insertions(+), 101 deletions(-) delete mode 100644 tasty-1.3.1.tar.gz create mode 100644 tasty-1.4.3.tar.gz delete mode 100644 tasty.cabal diff --git a/ghc-tasty.changes b/ghc-tasty.changes index 70abaf9..ebbd868 100644 --- a/ghc-tasty.changes +++ b/ghc-tasty.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Dec 18 21:32:26 UTC 2022 - Peter Simons + +- Update tasty to version 1.4.3. + 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/tasty-1.4.3/src/CHANGELOG.md + ------------------------------------------------------------------- Sat May 7 21:32:12 UTC 2022 - Peter Simons diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 89fa208..e75bd63 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -17,27 +17,32 @@ %global pkg_name tasty +%global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 1.3.1 +Version: 1.4.3 Release: 0 Summary: Modern and extensible testing framework License: MIT 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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-ansi-terminal-devel -BuildRequires: ghc-async-devel -BuildRequires: ghc-clock-devel +BuildRequires: ghc-ansi-terminal-prof +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-containers-devel -BuildRequires: ghc-mtl-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-optparse-applicative-devel +BuildRequires: ghc-optparse-applicative-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-stm-devel +BuildRequires: ghc-stm-prof BuildRequires: ghc-tagged-devel -BuildRequires: ghc-unbounded-delays-devel +BuildRequires: ghc-tagged-prof +BuildRequires: ghc-transformers-devel +BuildRequires: ghc-transformers-prof BuildRequires: ghc-unix-devel -BuildRequires: ghc-wcwidth-devel +BuildRequires: ghc-unix-prof ExcludeArch: %{ix86} %description @@ -55,9 +60,24 @@ Requires(postun): ghc-compiler = %{ghc_version} %description devel This package provides the Haskell %{pkg_name} library development files. +%package -n ghc-%{pkg_name}-doc +Summary: Haskell %{pkg_name} library documentation +Requires: ghc-filesystem +BuildArch: noarch + +%description -n ghc-%{pkg_name}-doc +This package provides the Haskell %{pkg_name} library documentation. + +%package -n ghc-%{pkg_name}-prof +Summary: Haskell %{pkg_name} profiling library +Requires: ghc-%{pkg_name}-devel = %{version}-%{release} +Supplements: (ghc-%{pkg_name}-devel and ghc-prof) + +%description -n ghc-%{pkg_name}-prof +This package provides the Haskell %{pkg_name} profiling library. + %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -77,4 +97,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %doc CHANGELOG.md README.md +%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files +%license LICENSE + +%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files + %changelog diff --git a/tasty-1.3.1.tar.gz b/tasty-1.3.1.tar.gz deleted file mode 100644 index 6c32d15..0000000 --- a/tasty-1.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cd5dff4a13527dfd9460134ae168a55c821e5bb9aece7ad9d00a1d03cc014dd -size 52190 diff --git a/tasty-1.4.3.tar.gz b/tasty-1.4.3.tar.gz new file mode 100644 index 0000000..25050b7 --- /dev/null +++ b/tasty-1.4.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f420da9560267271dce8a0007a1cb77c06987f0d129eb0f613110ce61f71cb00 +size 58726 diff --git a/tasty.cabal b/tasty.cabal deleted file mode 100644 index 054e010..0000000 --- a/tasty.cabal +++ /dev/null @@ -1,90 +0,0 @@ --- Initial tasty.cabal generated by cabal init. For further documentation, --- see http://haskell.org/cabal/users-guide/ - -name: tasty -version: 1.3.1 -x-revision: 1 -synopsis: Modern and extensible testing framework -description: Tasty is a modern testing framework for Haskell. - It lets you combine your unit tests, golden - tests, QuickCheck/SmallCheck properties, and any - other types of tests into a single test suite. -license: MIT -license-file: LICENSE -author: Roman Cheplyaka -maintainer: Roman Cheplyaka -homepage: https://github.com/feuerbach/tasty -bug-reports: https://github.com/feuerbach/tasty/issues --- copyright: -category: Testing -build-type: Simple -extra-source-files: CHANGELOG.md, README.md -cabal-version: >=1.10 - -Source-repository head - type: git - location: git://github.com/feuerbach/tasty.git - subdir: core - -flag clock - description: - Depend on the clock package for more accurate time measurement - default: True - -library - build-depends: mtl <2.3 - - exposed-modules: - Test.Tasty, - Test.Tasty.Options, - Test.Tasty.Providers, - Test.Tasty.Providers.ConsoleFormat, - Test.Tasty.Runners - Test.Tasty.Ingredients, - Test.Tasty.Ingredients.Basic - Test.Tasty.Ingredients.ConsoleReporter - - -- for testing only - Test.Tasty.Patterns.Types - Test.Tasty.Patterns.Parser - Test.Tasty.Patterns.Eval - other-modules: - Test.Tasty.Parallel, - Test.Tasty.Core, - Test.Tasty.Options.Core, - Test.Tasty.Options.Env, - Test.Tasty.Patterns, - Test.Tasty.Patterns.Expr, - Test.Tasty.Run, - Test.Tasty.Runners.Reducers, - Test.Tasty.Runners.Utils, - Test.Tasty.CmdLine, - Test.Tasty.Ingredients.ListTests - Test.Tasty.Ingredients.IncludingOptions - build-depends: - base >= 4.7 && < 5, - stm >= 2.3, - containers, - mtl >= 2.1.3.1, - tagged >= 0.5, - optparse-applicative >= 0.14, - unbounded-delays >= 0.1, - async >= 2.0, - ansi-terminal >= 0.9 - if(!impl(ghc >= 8.0)) - build-depends: semigroups - - if flag(clock) - build-depends: clock >= 0.4.4.0 - else - build-depends: time >= 1.4 - - if !os(windows) && !impl(ghcjs) - build-depends: unix, - wcwidth - cpp-options: -D__UNIX__ - - -- hs-source-dirs: - default-language: Haskell2010 - default-extensions: CPP, ScopedTypeVariables, DeriveDataTypeable - ghc-options: -Wall From 6927af64bc85e8169834f6d097c22c94c57cde879197a5b0b600d7cf5a0e1d6e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 17:38:53 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-tasty revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tasty?expand=0&rev=14 --- ghc-tasty.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-tasty.changes b/ghc-tasty.changes index ebbd868..7cd3770 100644 --- a/ghc-tasty.changes +++ b/ghc-tasty.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 30 17:08:30 UTC 2023 - Peter Simons + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + ------------------------------------------------------------------- Sun Dec 18 21:32:26 UTC 2022 - Peter Simons From 0cf4196ddbbc7c69f8ca778707fa3fceb2f4be4ca6b9c649779caabd78451536 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 17:51:48 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-tasty revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tasty?expand=0&rev=15 --- ghc-tasty.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index e75bd63..9f8c740 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-tasty # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed