From ea5d878e417cb0b07238b6e650856954f77bab09 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 16 Nov 2017 19:36:56 +0000 Subject: [PATCH 01/34] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..aca2120 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# ghc-tasty + +The ghc-tasty package \ No newline at end of file From 1d58def0a0b4ba29d8fa43fb80feb45d1e9bf0fe Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 16 Nov 2017 20:25:28 -0500 Subject: [PATCH 02/34] Initial import (#1513770). --- .gitignore | 1 + README.md | 3 -- ghc-tasty.spec | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 ghc-tasty.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..be279ee --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/tasty-0.12.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index aca2120..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ghc-tasty - -The ghc-tasty package \ No newline at end of file diff --git a/ghc-tasty.spec b/ghc-tasty.spec new file mode 100644 index 0000000..7e0e3f7 --- /dev/null +++ b/ghc-tasty.spec @@ -0,0 +1,81 @@ +# generated by cabal-rpm-0.11.2 +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name tasty +%global pkgver %{pkg_name}-%{version} + +Name: ghc-%{pkg_name} +Version: 0.12 +Release: 1%{?dist} +Summary: Modern and extensible testing framework + +License: MIT +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz + +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +BuildRequires: ghc-ansi-terminal-devel +BuildRequires: ghc-async-devel +BuildRequires: ghc-clock-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-optparse-applicative-devel +BuildRequires: ghc-regex-tdfa-devel +BuildRequires: ghc-stm-devel +BuildRequires: ghc-tagged-devel +BuildRequires: ghc-unbounded-delays-devel +BuildRequires: ghc-unix-devel +# End cabal-rpm deps + +%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. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. + + +%prep +%setup -q -n %{pkgver} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%license LICENSE + + +%files devel -f %{name}-devel.files +%doc CHANGELOG.md README.md + + +%changelog +* Wed Nov 15 2017 Fedora Haskell SIG - 0.12-1 +- spec file generated by cabal-rpm-0.11.2 diff --git a/sources b/sources new file mode 100644 index 0000000..0718cc4 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (tasty-0.12.tar.gz) = e55a80384117aa0f83ee71e283557c0820641f52c215008d08f84741c7638ce1718d7121f09abf8036084ae79af69cd4aa25de073ba283c6358d08c28a21ffb9 From 2106e3ad35bbc65fd1e348aa44e1cbbb64b93186 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:12:07 +0100 Subject: [PATCH 03/34] refresh to cabal-rpm-0.12.1 --- ghc-tasty.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 7e0e3f7..e236a9f 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.2 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name tasty @@ -39,9 +39,12 @@ tests into a single test suite. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +%if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} +%endif Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -60,6 +63,12 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_lib_install +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From be31616fdafcf5112e1796d17f02ee1a5fa992d9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:55:14 +0100 Subject: [PATCH 04/34] update to 0.11.3 --- .gitignore | 1 + ghc-tasty.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index be279ee..4da7e6a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /tasty-0.12.tar.gz +/tasty-0.11.3.tar.gz diff --git a/ghc-tasty.spec b/ghc-tasty.spec index e236a9f..03abcac 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -5,7 +5,7 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.12 +Version: 0.11.3 Release: 1%{?dist} Summary: Modern and extensible testing framework @@ -86,5 +86,8 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jan 24 2018 Jens Petersen - 0.11.3-1 +- update to 0.11.3 + * Wed Nov 15 2017 Fedora Haskell SIG - 0.12-1 - spec file generated by cabal-rpm-0.11.2 diff --git a/sources b/sources index 0718cc4..b7c6d74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tasty-0.12.tar.gz) = e55a80384117aa0f83ee71e283557c0820641f52c215008d08f84741c7638ce1718d7121f09abf8036084ae79af69cd4aa25de073ba283c6358d08c28a21ffb9 +SHA512 (tasty-0.11.3.tar.gz) = 2cdaf4366847c908670a303725e42c473b27bd8b01d9bde193cae8c758eee3c6f7baf77e09bfb6720427bafc1042f0e9418dd8cbd80333b0a7d053d5b3928a31 From 384822e07ef7ab298fe84336e92c4ac78de330e2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 28 Jan 2018 07:10:49 +0100 Subject: [PATCH 05/34] "revert" back up to newer 0.12.0.1 cabal-rpm had downgraded to LTS 10 --- .gitignore | 1 + ghc-tasty.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4da7e6a..96eb9e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /tasty-0.12.tar.gz /tasty-0.11.3.tar.gz +/tasty-0.12.0.1.tar.gz diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 03abcac..4959a30 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -5,7 +5,7 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.11.3 +Version: 0.12.0.1 Release: 1%{?dist} Summary: Modern and extensible testing framework @@ -86,8 +86,8 @@ This package provides the Haskell %{pkg_name} library development files. %changelog -* Wed Jan 24 2018 Jens Petersen - 0.11.3-1 -- update to 0.11.3 +* Sun Jan 28 2018 Jens Petersen - 0.12.0.1-1 +- update to 0.12.0.1 * Wed Nov 15 2017 Fedora Haskell SIG - 0.12-1 - spec file generated by cabal-rpm-0.11.2 diff --git a/sources b/sources index b7c6d74..ec70f3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tasty-0.11.3.tar.gz) = 2cdaf4366847c908670a303725e42c473b27bd8b01d9bde193cae8c758eee3c6f7baf77e09bfb6720427bafc1042f0e9418dd8cbd80333b0a7d053d5b3928a31 +SHA512 (tasty-0.12.0.1.tar.gz) = e48fd98fc99b100d0d1abaaefef0d9d557f0e052fe82da1bdaa6051edc41b35955e6d3a5e12b7686f83a6a4041e1555c0396ad0488c0e7a4a4947af221eba6f6 From d569ca0a0a4e4f78e3f66956202eb477e31bb583 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:03:33 +0900 Subject: [PATCH 06/34] drop ldconfig scriptlets --- ghc-tasty.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 4959a30..9026bb9 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -63,12 +63,6 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_lib_install -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 99d80e8aa5b2768c33f20ae9a72a14b491976c4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 12:13:16 +0000 Subject: [PATCH 07/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-tasty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 9026bb9..8ebb680 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.12.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -80,6 +80,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.12.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Jan 28 2018 Jens Petersen - 0.12.0.1-1 - update to 0.12.0.1 From b006c7acfd66c44619b99775a400a8a41731e34e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 9 Jul 2018 01:05:24 -0400 Subject: [PATCH 08/34] update to 1.0.1.1 --- .gitignore | 1 + ghc-tasty.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 96eb9e8..5f420de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /tasty-0.12.tar.gz /tasty-0.11.3.tar.gz /tasty-0.12.0.1.tar.gz +/tasty-1.0.1.1.tar.gz diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 8ebb680..f49ad3d 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.12.0.1 -Release: 2%{?dist} +Version: 1.0.1.1 +Release: 1%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -20,10 +20,8 @@ BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-async-devel BuildRequires: ghc-clock-devel BuildRequires: ghc-containers-devel -BuildRequires: ghc-deepseq-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-optparse-applicative-devel -BuildRequires: ghc-regex-tdfa-devel BuildRequires: ghc-stm-devel BuildRequires: ghc-tagged-devel BuildRequires: ghc-unbounded-delays-devel @@ -80,6 +78,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Jul 09 2018 Elliott Sales de Andrade - 1.0.1.1-1 +- update to 1.0.1.1 + * Wed Feb 07 2018 Fedora Release Engineering - 0.12.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index ec70f3e..38aa9f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tasty-0.12.0.1.tar.gz) = e48fd98fc99b100d0d1abaaefef0d9d557f0e052fe82da1bdaa6051edc41b35955e6d3a5e12b7686f83a6a4041e1555c0396ad0488c0e7a4a4947af221eba6f6 +SHA512 (tasty-1.0.1.1.tar.gz) = 2ab43155f81403e5067707faab2ef3656eea9f9ac9f7f0ca5335e7309844b903b08b9a062d57d14480e1f69e326d349e5129f7d1449708dcd1e1cf4968d8fdc3 From ffe0f1fadbf1f7bb91a2e7a753b0b67475dba775 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:10:38 +0000 Subject: [PATCH 09/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-tasty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index f49ad3d..6f181a4 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -78,6 +78,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.0.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 09 2018 Elliott Sales de Andrade - 1.0.1.1-1 - update to 1.0.1.1 From 402d543e89a8dac6321f5eb7c3aa1c74c35b324c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 29 Jul 2018 01:06:02 +0900 Subject: [PATCH 10/34] rebuild --- ghc-tasty.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 6f181a4..e0eeadd 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name tasty @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -78,6 +78,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Jul 28 2018 Jens Petersen - 1.0.1.1-3 +- rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.0.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 9577c3587ebd4a75055a2d32151ea711016e59da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 22:05:44 +0000 Subject: [PATCH 11/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-tasty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index e0eeadd..60ec9ba 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -78,6 +78,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.0.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 28 2018 Jens Petersen - 1.0.1.1-3 - rebuild From d6dd7454da77610d25307545533adf853093db32 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:47:22 +0800 Subject: [PATCH 12/34] refresh to cabal-rpm-0.13 --- ghc-tasty.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 60ec9ba..7b07483 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name tasty @@ -6,16 +6,18 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Modern and extensible testing framework License: MIT Url: https://hackage.haskell.org/package/%{pkg_name} +# Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +# End cabal-rpm sources +# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-async-devel BuildRequires: ghc-clock-devel @@ -50,15 +52,21 @@ This package provides the Haskell %{pkg_name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} +# End cabal-rpm setup %build +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install +# End cabal-rpm install %post devel @@ -70,7 +78,9 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -78,6 +88,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Feb 17 2019 Jens Petersen - 1.0.1.1-5 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 1.0.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 8a1f2fc1f13285f23c1f644038e644a4e60cf90d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 21 Feb 2019 12:24:08 +0800 Subject: [PATCH 13/34] update to 1.1.0.4 --- .gitignore | 2 ++ ghc-tasty.spec | 31 +++++++++++++++++++++++++++---- sources | 3 ++- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5f420de..ef4b528 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /tasty-0.11.3.tar.gz /tasty-0.12.0.1.tar.gz /tasty-1.0.1.1.tar.gz +/tasty-1.1.0.4.tar.gz +/wcwidth-0.0.2.tar.gz diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 7b07483..3d9548b 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -4,20 +4,26 @@ %global pkg_name tasty %global pkgver %{pkg_name}-%{version} +%global wcwidth wcwidth-0.0.2 +%global subpkgs %{wcwidth} + Name: ghc-%{pkg_name} -Version: 1.0.1.1 -Release: 5%{?dist} +Version: 1.1.0.4 +# can only be reset when all subpkgs bumped +Release: 1%{?dist} Summary: Modern and extensible testing framework License: MIT Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{wcwidth}/%{wcwidth}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra +BuildRequires: chrpath BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-async-devel BuildRequires: ghc-clock-devel @@ -28,6 +34,7 @@ BuildRequires: ghc-stm-devel BuildRequires: ghc-tagged-devel BuildRequires: ghc-unbounded-delays-devel BuildRequires: ghc-unix-devel +#BuildRequires: ghc-wcwidth-devel # End cabal-rpm deps %description @@ -51,21 +58,33 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{wcwidth} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} +%setup -q -n %{pkgver} -a1 # End cabal-rpm setup %build # Begin cabal-rpm build: +%ghc_libs_build %{subpkgs} %ghc_lib_build # End cabal-rpm build %install # Begin cabal-rpm install +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} # End cabal-rpm install @@ -88,6 +107,10 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Feb 21 2019 Jens Petersen - 1.1.0.4-1 +- update to 1.1.0.4 +- add wcwidth subpackage + * Sun Feb 17 2019 Jens Petersen - 1.0.1.1-5 - refresh to cabal-rpm-0.13 diff --git a/sources b/sources index 38aa9f1..aa73bc0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (tasty-1.0.1.1.tar.gz) = 2ab43155f81403e5067707faab2ef3656eea9f9ac9f7f0ca5335e7309844b903b08b9a062d57d14480e1f69e326d349e5129f7d1449708dcd1e1cf4968d8fdc3 +SHA512 (tasty-1.1.0.4.tar.gz) = 1e4814c8e3bd76b8dcd736a14b9fd250d84d2c6c96f3535f59ae89bae229af36fd2ebbf8b57026553cf89cd2c72edcbbbd047e9ed0c7cfc17a8dff1a6edf6a7e +SHA512 (wcwidth-0.0.2.tar.gz) = 555c38183c7c402a66c151e52bbac9e6c501528cd661ad1708576444b6dc4daa19e0d75c9b79f8590843e0e40b3758d9bea08e426e754688cd32070dfce5a649 From b86688e31437f62db7e5e8de86a394179484935a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:04:27 +0000 Subject: [PATCH 14/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-tasty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 3d9548b..0809510 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 1.1.0.4 # can only be reset when all subpkgs bumped -Release: 1%{?dist} +Release: 2%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -107,6 +107,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.1.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 21 2019 Jens Petersen - 1.1.0.4-1 - update to 1.1.0.4 - add wcwidth subpackage From a0545e289eea504ca3c8a4cd914a3c5e70bae10a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:26:11 +0000 Subject: [PATCH 15/34] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- ghc-tasty.spec | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 0809510..f8025a7 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name tasty @@ -22,6 +22,12 @@ Source1: https://hackage.haskell.org/package/%{wcwidth}/%{wcwidth}.tar.gz # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros-extra BuildRequires: chrpath BuildRequires: ghc-ansi-terminal-devel @@ -46,11 +52,8 @@ tests into a single test suite. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} -Provides: %{name}-doc = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} -Requires(post): ghc-compiler = %{ghc_version} -Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: %{name}%{?_isa} = %{version}-%{release} @@ -58,6 +61,25 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. +%if %{with haddock} +%package doc +Summary: Haskell %{pkg_name} library documentation + +%description doc +This package provides the Haskell %{pkg_name} library documentation. +%endif + + +%if %{with ghc_prof} +%package prof +Summary: Haskell %{pkg_name} profiling library +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description prof +This package provides the Haskell %{pkg_name} profiling library. +%endif + + %global main_version %{version} %if %{defined ghclibdir} @@ -88,14 +110,6 @@ This package provides the Haskell %{pkg_name} library development files. # End cabal-rpm install -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -106,6 +120,16 @@ This package provides the Haskell %{pkg_name} library development files. %doc CHANGELOG.md README.md +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog * Thu Jul 25 2019 Fedora Release Engineering - 1.1.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 43dae28a7609e36b2469b2ddb781a72b87559f47 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 16:45:36 +0000 Subject: [PATCH 16/34] update to 1.2 --- .gitignore | 1 + ghc-tasty.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ef4b528..3c1c201 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /tasty-1.0.1.1.tar.gz /tasty-1.1.0.4.tar.gz /wcwidth-0.0.2.tar.gz +/tasty-1.2.tar.gz diff --git a/ghc-tasty.spec b/ghc-tasty.spec index f8025a7..6f858fa 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -8,9 +8,9 @@ %global subpkgs %{wcwidth} Name: ghc-%{pkg_name} -Version: 1.1.0.4 +Version: 1.2 # can only be reset when all subpkgs bumped -Release: 2%{?dist} +Release: 3%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -131,6 +131,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 25 2019 Jens Petersen - 1.2-3 +- update to 1.2 + * Thu Jul 25 2019 Fedora Release Engineering - 1.1.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index aa73bc0..f4e5ff8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (tasty-1.1.0.4.tar.gz) = 1e4814c8e3bd76b8dcd736a14b9fd250d84d2c6c96f3535f59ae89bae229af36fd2ebbf8b57026553cf89cd2c72edcbbbd047e9ed0c7cfc17a8dff1a6edf6a7e SHA512 (wcwidth-0.0.2.tar.gz) = 555c38183c7c402a66c151e52bbac9e6c501528cd661ad1708576444b6dc4daa19e0d75c9b79f8590843e0e40b3758d9bea08e426e754688cd32070dfce5a649 +SHA512 (tasty-1.2.tar.gz) = 7f5a97b646d08bc6c7a2470fa57c83df73b6bb2a68ffb55695f82ddcde0a9920323af6c54fda0d2253e990cdca4cad4d28a7e27aaba532f2aecfea6411d02156 From 169ce0b4b8e9d6d879ff055d53e40d684df655c0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:32:10 +0800 Subject: [PATCH 17/34] BR prof for lib and static for executable --- ghc-tasty.spec | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 6f858fa..cf8c2f3 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.0 --subpackage +# generated by cabal-rpm-1.0.1 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name tasty @@ -22,25 +22,20 @@ Source1: https://hackage.haskell.org/package/%{wcwidth}/%{wcwidth}.tar.gz # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -%if %{with haddock} -BuildRequires: ghc-doc -%endif -%if %{with ghc_prof} -BuildRequires: ghc-prof -%endif BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-ansi-terminal-prof +BuildRequires: ghc-async-prof +BuildRequires: ghc-base-prof +BuildRequires: ghc-clock-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-mtl-prof +BuildRequires: ghc-optparse-applicative-prof +BuildRequires: ghc-stm-prof +BuildRequires: ghc-tagged-prof +BuildRequires: ghc-unbounded-delays-prof +BuildRequires: ghc-unix-prof +#BuildRequires: ghc-wcwidth-prof BuildRequires: chrpath -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-stm-devel -BuildRequires: ghc-tagged-devel -BuildRequires: ghc-unbounded-delays-devel -BuildRequires: ghc-unix-devel -#BuildRequires: ghc-wcwidth-devel # End cabal-rpm deps %description @@ -52,6 +47,7 @@ tests into a single test suite. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-static%{?_isa} = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} %endif From ff666cc0dd6af06b783973d9226e2aeec1711488 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:28:20 +0000 Subject: [PATCH 18/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-tasty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index cf8c2f3..f398762 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 1.2 # can only be reset when all subpkgs bumped -Release: 3%{?dist} +Release: 4%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -127,6 +127,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Jens Petersen - 1.2-3 - update to 1.2 From 3241dccf04b196260c7a9aa8ba3804a6b9358ec1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 7 Feb 2020 00:16:41 +0800 Subject: [PATCH 19/34] refresh to cabal-rpm-2.0.2 --- ghc-tasty.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index f398762..d38149a 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 --subpackage +# generated by cabal-rpm-2.0.2 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name tasty @@ -35,7 +35,6 @@ BuildRequires: ghc-tagged-prof BuildRequires: ghc-unbounded-delays-prof BuildRequires: ghc-unix-prof #BuildRequires: ghc-wcwidth-prof -BuildRequires: chrpath # End cabal-rpm deps %description @@ -60,6 +59,7 @@ This package provides the Haskell %{pkg_name} library development files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch %description doc This package provides the Haskell %{pkg_name} library documentation. @@ -70,6 +70,7 @@ This package provides the Haskell %{pkg_name} library documentation. %package prof Summary: Haskell %{pkg_name} profiling library Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) %description prof This package provides the Haskell %{pkg_name} profiling library. @@ -106,6 +107,16 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm install +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif + + %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -118,6 +129,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From 059abd0bcf9e1d52e6b54a1b6c3ae96ada79ca60 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 12:04:48 +0800 Subject: [PATCH 20/34] update to 1.2.3 --- .gitignore | 1 + ghc-tasty.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3c1c201..b3d5977 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /tasty-1.1.0.4.tar.gz /wcwidth-0.0.2.tar.gz /tasty-1.2.tar.gz +/tasty-1.2.3.tar.gz diff --git a/ghc-tasty.spec b/ghc-tasty.spec index d38149a..c11db44 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -8,9 +8,9 @@ %global subpkgs %{wcwidth} Name: ghc-%{pkg_name} -Version: 1.2 +Version: 1.2.3 # can only be reset when all subpkgs bumped -Release: 4%{?dist} +Release: 5%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -139,6 +139,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Feb 14 2020 Jens Petersen - 1.2.3-5 +- update to 1.2.3 + * Tue Jan 28 2020 Fedora Release Engineering - 1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index f4e5ff8..e3c36e2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (wcwidth-0.0.2.tar.gz) = 555c38183c7c402a66c151e52bbac9e6c501528cd661ad1708576444b6dc4daa19e0d75c9b79f8590843e0e40b3758d9bea08e426e754688cd32070dfce5a649 -SHA512 (tasty-1.2.tar.gz) = 7f5a97b646d08bc6c7a2470fa57c83df73b6bb2a68ffb55695f82ddcde0a9920323af6c54fda0d2253e990cdca4cad4d28a7e27aaba532f2aecfea6411d02156 +SHA512 (tasty-1.2.3.tar.gz) = 3922fc19c3ed74b1a39f8e6dc5fe243a955ab55d2e9d08d68b0932dfa0d16cb1efbc73bb2d793c1226d56986141494ce0490c9af70e7e612d07da64d5e2ee472 From 4b2a93766cd389a4a4d72762c34ade32592d3701 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:28:30 +0800 Subject: [PATCH 21/34] refresh to cabal-rpm-2.0.5 --- ghc-tasty.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index c11db44..dd14cf6 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -1,5 +1,5 @@ -# generated by cabal-rpm-2.0.2 --subpackage -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.5 --subpackage +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name tasty %global pkgver %{pkg_name}-%{version} From 7fcba297909e8e16ab518c77e2dc4f764c7bc9ce Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:57:07 +0800 Subject: [PATCH 22/34] refresh to cabal-rpm-2.0.6 --- ghc-tasty.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index dd14cf6..38ea1c3 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 --subpackage +# generated by cabal-rpm-2.0.6 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name tasty @@ -107,16 +107,6 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm install -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE From a30c039e040beed9b359b5de94efbdd2187e1476 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 18:41:03 +0800 Subject: [PATCH 23/34] bump release --- ghc-tasty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 38ea1c3..c7f0da9 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 1.2.3 # can only be reset when all subpkgs bumped -Release: 5%{?dist} +Release: 6%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -129,6 +129,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Jul 17 2020 Jens Petersen - 1.2.3-6 +- refresh to cabal-rpm-2.0.6 + * Fri Feb 14 2020 Jens Petersen - 1.2.3-5 - update to 1.2.3 From 4052396b618b2f4143204aa9329b0cd792bbaa3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:43:37 +0000 Subject: [PATCH 24/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-tasty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index c7f0da9..9f6daef 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 1.2.3 # can only be reset when all subpkgs bumped -Release: 6%{?dist} +Release: 7%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -129,6 +129,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 1.2.3-6 - refresh to cabal-rpm-2.0.6 From cd53a9aa49d3a967b0abbb99fb2f82b7431bd8fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:33:04 +0000 Subject: [PATCH 25/34] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-tasty.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 9f6daef..53c8173 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 1.2.3 # can only be reset when all subpkgs bumped -Release: 7%{?dist} +Release: 8%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -129,6 +129,10 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.2.3-8 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.2.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From b3519e4f4ee088567a1433c02725be271624b940 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:47:24 +0000 Subject: [PATCH 26/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-tasty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 53c8173..c2caaab 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 1.2.3 # can only be reset when all subpkgs bumped -Release: 8%{?dist} +Release: 9%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -129,6 +129,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 1.2.3-8 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From fddb437d61c2c099e5dc6264ff956e0cdcb0cbb9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:19:05 +0000 Subject: [PATCH 27/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-tasty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index c2caaab..806da46 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 1.2.3 # can only be reset when all subpkgs bumped -Release: 9%{?dist} +Release: 10%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -129,6 +129,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.2.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.2.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a457d8d98a1d78014d2623712638ed9879214de6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:13 +0800 Subject: [PATCH 28/34] refresh to cabal-rpm-2.0.9 --- ghc-tasty.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 806da46..9698f30 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.6 --subpackage +# generated by cabal-rpm-2.0.9 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name tasty @@ -60,6 +60,7 @@ This package provides the Haskell %{pkg_name} library development files. %package doc Summary: Haskell %{pkg_name} library documentation BuildArch: noarch +Requires: ghc-filesystem %description doc This package provides the Haskell %{pkg_name} library documentation. From 46757ed2f4a91e6456f41a284442750e0c4d68a1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 12:52:28 +0800 Subject: [PATCH 29/34] update to 1.4.1 --- .gitignore | 1 + ghc-tasty.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b3d5977..d691c72 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /wcwidth-0.0.2.tar.gz /tasty-1.2.tar.gz /tasty-1.2.3.tar.gz +/tasty-1.4.1.tar.gz diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 9698f30..04cfb11 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -8,7 +8,7 @@ %global subpkgs %{wcwidth} Name: ghc-%{pkg_name} -Version: 1.2.3 +Version: 1.4.1 # can only be reset when all subpkgs bumped Release: 10%{?dist} Summary: Modern and extensible testing framework @@ -24,7 +24,6 @@ Source1: https://hackage.haskell.org/package/%{wcwidth}/%{wcwidth}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-ansi-terminal-prof -BuildRequires: ghc-async-prof BuildRequires: ghc-base-prof BuildRequires: ghc-clock-prof BuildRequires: ghc-containers-prof @@ -130,6 +129,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Aug 5 2021 Jens Petersen - 1.4.1-10 +- update to 1.4.1 + * Thu Jul 22 2021 Fedora Release Engineering - 1.2.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index e3c36e2..283aae7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (wcwidth-0.0.2.tar.gz) = 555c38183c7c402a66c151e52bbac9e6c501528cd661ad1708576444b6dc4daa19e0d75c9b79f8590843e0e40b3758d9bea08e426e754688cd32070dfce5a649 -SHA512 (tasty-1.2.3.tar.gz) = 3922fc19c3ed74b1a39f8e6dc5fe243a955ab55d2e9d08d68b0932dfa0d16cb1efbc73bb2d793c1226d56986141494ce0490c9af70e7e612d07da64d5e2ee472 +SHA512 (tasty-1.4.1.tar.gz) = 72f7dfc60d1582be25ff7e5015ba735156fcc2e8074f0655c68eb4f0c0d2063aa882c2407fe8858a47a316d90b84f8b40a511663642bdc43739c3f02beb021b2 From a13d7f37d8fbd8cc335efef7dbd71184493a33f2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 7 Aug 2021 01:57:18 +0800 Subject: [PATCH 30/34] bump release for subpackage --- ghc-tasty.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 04cfb11..1f11258 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 1.4.1 # can only be reset when all subpkgs bumped -Release: 10%{?dist} +Release: 11%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -129,7 +129,7 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog -* Thu Aug 5 2021 Jens Petersen - 1.4.1-10 +* Sat Aug 7 2021 Jens Petersen - 1.4.1-11 - update to 1.4.1 * Thu Jul 22 2021 Fedora Release Engineering - 1.2.3-10 From f5fd54051bf84631541efba78f7b4c78b628f622 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:37:00 +0000 Subject: [PATCH 31/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-tasty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 1f11258..95f60a8 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 1.4.1 # can only be reset when all subpkgs bumped -Release: 11%{?dist} +Release: 12%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -129,6 +129,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.4.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Aug 7 2021 Jens Petersen - 1.4.1-11 - update to 1.4.1 From 5c0087d1e807b9857dd41877e1384b08904603e3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 10 Mar 2022 14:56:27 +0800 Subject: [PATCH 32/34] bump release --- ghc-tasty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 95f60a8..a56e863 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 1.4.1 # can only be reset when all subpkgs bumped -Release: 12%{?dist} +Release: 13%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -129,6 +129,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Mar 10 2022 Jens Petersen - 1.4.1-13 +- rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.4.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a3bf701555e5631ccdd29bb940f0e907200a1427 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Jun 2022 14:48:19 +0800 Subject: [PATCH 33/34] update to 1.4.2.1 --- .gitignore | 1 + ghc-tasty.spec | 13 ++++-- sources | 2 +- tasty-1.4.2.1.cabal | 96 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+), 5 deletions(-) create mode 100644 tasty-1.4.2.1.cabal diff --git a/.gitignore b/.gitignore index d691c72..a9c2411 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /tasty-1.2.tar.gz /tasty-1.2.3.tar.gz /tasty-1.4.1.tar.gz +/tasty-1.4.2.1.tar.gz diff --git a/ghc-tasty.spec b/ghc-tasty.spec index a56e863..af9d59b 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.9 --subpackage +# generated by cabal-rpm-2.0.12 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name tasty @@ -8,9 +8,9 @@ %global subpkgs %{wcwidth} Name: ghc-%{pkg_name} -Version: 1.4.1 +Version: 1.4.2.1 # can only be reset when all subpkgs bumped -Release: 13%{?dist} +Release: 14%{?dist} Summary: Modern and extensible testing framework License: MIT @@ -18,9 +18,11 @@ Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{wcwidth}/%{wcwidth}.tar.gz +Source2: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: +BuildRequires: dos2unix BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-ansi-terminal-prof @@ -89,6 +91,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -a1 +dos2unix -k -n %{SOURCE2} %{pkg_name}.cabal # End cabal-rpm setup @@ -103,7 +106,6 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm install %ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_rpath %{pkgver} # End cabal-rpm install @@ -129,6 +131,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jun 07 2022 Jens Petersen - 1.4.2.1-14 +- https://hackage.haskell.org/package/tasty-1.4.2.1/changelog + * Thu Mar 10 2022 Jens Petersen - 1.4.1-13 - rebuild diff --git a/sources b/sources index 283aae7..c915449 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (wcwidth-0.0.2.tar.gz) = 555c38183c7c402a66c151e52bbac9e6c501528cd661ad1708576444b6dc4daa19e0d75c9b79f8590843e0e40b3758d9bea08e426e754688cd32070dfce5a649 -SHA512 (tasty-1.4.1.tar.gz) = 72f7dfc60d1582be25ff7e5015ba735156fcc2e8074f0655c68eb4f0c0d2063aa882c2407fe8858a47a316d90b84f8b40a511663642bdc43739c3f02beb021b2 +SHA512 (tasty-1.4.2.1.tar.gz) = 71a0b995fa9b7f02d25a62cb161a6af8421731fd1484f129d893869f3439498b1bf71c74863e34f1f50073d3a503b4ca088e784234b8758a788e5df05baee90f diff --git a/tasty-1.4.2.1.cabal b/tasty-1.4.2.1.cabal new file mode 100644 index 0000000..74bbd3c --- /dev/null +++ b/tasty-1.4.2.1.cabal @@ -0,0 +1,96 @@ +-- Initial tasty.cabal generated by cabal init. For further documentation, +-- see http://haskell.org/cabal/users-guide/ + +name: tasty +version: 1.4.2.1 +x-revision: 2 +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/UnkindPartition/tasty +bug-reports: https://github.com/UnkindPartition/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/UnkindPartition/tasty.git + subdir: core + +flag clock + description: + Depend on the clock package for more accurate time measurement + default: True + +flag unix + description: + Depend on the unix package to install signal handlers + 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.Printer + Test.Tasty.Patterns.Eval + other-modules: + Control.Concurrent.Async + 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.9 && < 5, + stm >= 2.3, + containers, + mtl >= 2.1.3.1, + tagged >= 0.5, + optparse-applicative >= 0.14, + unbounded-delays >= 0.1, + ansi-terminal >= 0.9 + if(!impl(ghc >= 8.0)) + build-depends: semigroups + + if flag(clock) && !impl(ghcjs) + build-depends: clock >= 0.4.4.0 + else + build-depends: time >= 1.4 + + if !os(windows) && !impl(ghcjs) + build-depends: wcwidth + if flag(unix) + build-depends: unix + + -- hs-source-dirs: + default-language: Haskell2010 + default-extensions: CPP, ScopedTypeVariables, DeriveDataTypeable + ghc-options: -Wall -Wno-incomplete-uni-patterns From e9f16be5923fb34d77819f2441b49fd28053c872 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:59:55 +0300 Subject: [PATCH 34/34] Remove unnecessary files --- sources | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index c915449..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (wcwidth-0.0.2.tar.gz) = 555c38183c7c402a66c151e52bbac9e6c501528cd661ad1708576444b6dc4daa19e0d75c9b79f8590843e0e40b3758d9bea08e426e754688cd32070dfce5a649 -SHA512 (tasty-1.4.2.1.tar.gz) = 71a0b995fa9b7f02d25a62cb161a6af8421731fd1484f129d893869f3439498b1bf71c74863e34f1f50073d3a503b4ca088e784234b8758a788e5df05baee90f