From b13a2efe6f199398eb5c3a6474166e700b0ac1cb Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 3 Jan 2018 12:35:40 +0000 Subject: [PATCH 01/30] 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..e37f42a --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# ghc-clock + +The ghc-clock package \ No newline at end of file From 6d089b9caf024e4e74f252b7069ab79b470af430 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 9 Jan 2018 17:51:51 +0900 Subject: [PATCH 02/30] import (#1530182) --- .gitignore | 1 + README.md | 3 -- ghc-clock.spec | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 ghc-clock.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0ae679b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/clock-0.7.2.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index e37f42a..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ghc-clock - -The ghc-clock package \ No newline at end of file diff --git a/ghc-clock.spec b/ghc-clock.spec new file mode 100644 index 0000000..b199bcf --- /dev/null +++ b/ghc-clock.spec @@ -0,0 +1,80 @@ +# generated by cabal-rpm-0.12 +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name clock +%global pkgver %{pkg_name}-%{version} + +%bcond_without tests + +Name: ghc-%{pkg_name} +Version: 0.7.2 +Release: 1%{?dist} +Summary: High-resolution clock functions: monotonic, realtime, cputime + +License: BSD +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: +%if %{with tests} +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-quickcheck-devel +%endif +# End cabal-rpm deps + +%description +A package for convenient access to high-resolution clock and timer functions of +different operating systems via a unified API. + + +%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 +This package provides the Haskell %{pkg_name} library development files. + + +%prep +%setup -q -n %{pkgver} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + + +%check +%cabal_test + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%license LICENSE + + +%files devel -f %{name}-devel.files + + +%changelog +* Tue Jan 2 2018 Fedora Haskell SIG - 0.7.2-1 +- spec file generated by cabal-rpm-0.12 diff --git a/sources b/sources new file mode 100644 index 0000000..8e282d3 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (clock-0.7.2.tar.gz) = cf44dfca6c0825a003018c68266ef0fe503a9b147aaf784435f6297b365c6d18fc71b63b77a23ee2a3298ace638a35de0c6118e361d43b418a45d4fdd24d57cf From e4ed42f2fbc16b736bf6d54c9530785befa91077 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 9 Jan 2018 18:07:14 +0900 Subject: [PATCH 03/30] bump over hlint --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index b199bcf..b1ae5f3 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.7.2 -Release: 1%{?dist} +Release: 5%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -76,5 +76,8 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Jan 9 2018 Jens Petersen - 0.7.2-5 +- bump release over hlint + * Tue Jan 2 2018 Fedora Haskell SIG - 0.7.2-1 - spec file generated by cabal-rpm-0.12 From 29645ae23bbf6632a62975bee431d4d1f25cae1b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:10:46 +0100 Subject: [PATCH 04/30] refresh to cabal-rpm-0.12.1 --- ghc-clock.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index b1ae5f3..4ab4d4e 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name clock @@ -60,6 +60,12 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From c6bb332a7b12be0e0b010addd58b92b345a90d65 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Jan 2018 11:23:32 +0100 Subject: [PATCH 05/30] bump release --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 4ab4d4e..4ac0c31 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.7.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -82,6 +82,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jan 26 2018 Jens Petersen - 0.7.2-6 +- rebuild + * Tue Jan 9 2018 Jens Petersen - 0.7.2-5 - bump release over hlint From 70f915304cd09f8517a93f8e3fae0cdb52ddac29 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 27 Jan 2018 09:38:31 +0100 Subject: [PATCH 06/30] disable tests temporarily to build with only ghc since newrepo not running currently in koji --- ghc-clock.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 4ac0c31..79f57d1 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -4,7 +4,8 @@ %global pkg_name clock %global pkgver %{pkg_name}-%{version} -%bcond_without tests +# temporarily disable tests for ghc82 rebuilds +%bcond_with tests Name: ghc-%{pkg_name} Version: 0.7.2 From ca34c40e35f47c8039151f63bbaa92d256457f52 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:02:09 +0900 Subject: [PATCH 07/30] drop ldconfig scriptlets --- ghc-clock.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 79f57d1..827bf2b 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -61,12 +61,6 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From f2e0a7f666ff738be27f4d8b6a1ebea229ec3564 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:25:30 +0000 Subject: [PATCH 08/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 827bf2b..0e909ee 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 0.7.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -77,6 +77,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.7.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Jan 26 2018 Jens Petersen - 0.7.2-6 - rebuild From 44553b74520ca5cd005c482ddef9c9ff235f4d85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 01:38:22 +0000 Subject: [PATCH 09/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 0e909ee..7f0d49a 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 0.7.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -77,6 +77,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.7.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.7.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 245c4b7263dd36a64c4b50b993c7bd84617d0147 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:17:41 +0000 Subject: [PATCH 10/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 7f0d49a..c9a1435 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 0.7.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -77,6 +77,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.7.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.7.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 20a696b65a8e0d59d07d45ee94ec9c013d6da940 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:43:55 +0800 Subject: [PATCH 11/30] refresh to cabal-rpm-0.13 --- ghc-clock.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index c9a1435..fe4a5cc 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name clock @@ -9,16 +9,18 @@ Name: ghc-%{pkg_name} Version: 0.7.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD 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: %if %{with tests} BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-quickcheck-devel @@ -46,15 +48,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 %check @@ -70,13 +78,18 @@ 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 %changelog +* Sun Feb 17 2019 Jens Petersen - 0.7.2-10 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.7.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0a30614727aaa5b36a8341ff537d17e6bc30de32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:13:56 +0000 Subject: [PATCH 12/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index fe4a5cc..4c4f9d6 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 0.7.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -87,6 +87,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.7.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 0.7.2-10 - refresh to cabal-rpm-0.13 From 8a28df5cd19eec85f461d5e6fcd08e6187bc28f6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:22:07 +0000 Subject: [PATCH 13/30] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-clock.spec | 53 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 4c4f9d6..f70e359 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name clock @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 0.7.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -20,6 +20,12 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.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 %if %{with tests} BuildRequires: ghc-tasty-devel @@ -35,11 +41,8 @@ different operating systems via a unified API. %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} @@ -47,6 +50,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 + + %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} @@ -69,14 +91,6 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -86,7 +100,20 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog +* Thu Aug 01 2019 Jens Petersen - 0.7.2-12 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 0.7.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ac7da7d8a4d8893e700fd0ccc3c2f55595b603cf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:28:06 +0800 Subject: [PATCH 14/30] BR prof for lib and static for executable --- ghc-clock.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index f70e359..84ee144 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.0 +# generated by cabal-rpm-1.0.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name clock @@ -20,13 +20,8 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.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 +BuildRequires: ghc-base-prof %if %{with tests} BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-quickcheck-devel @@ -41,6 +36,7 @@ different operating systems via a unified API. %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 3418b348bb35f60741551590e064d88e195f9b40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:25:12 +0000 Subject: [PATCH 15/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 84ee144..4817d83 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 0.7.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -107,6 +107,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.7.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Aug 01 2019 Jens Petersen - 0.7.2-12 - add doc and prof subpackages (cabal-rpm-1.0.0) From b18177d6aba61a6b2d6824ca643c08f6e614be5b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:49:24 +0800 Subject: [PATCH 16/30] refresh to cabal-rpm-2.0.2 --- ghc-clock.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 4817d83..d58fe9a 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name clock @@ -49,6 +49,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. @@ -59,6 +60,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. @@ -87,6 +89,16 @@ This package provides the Haskell %{pkg_name} profiling library. %cabal_test +%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 @@ -98,6 +110,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From 16cf3a5adfc9f55685c7ff7eeea5f1d43359af30 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 10:52:25 +0800 Subject: [PATCH 17/30] update to 0.8 --- .gitignore | 1 + ghc-clock.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0ae679b..179df0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /clock-0.7.2.tar.gz +/clock-0.8.tar.gz diff --git a/ghc-clock.spec b/ghc-clock.spec index d58fe9a..3a06a7e 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -8,8 +8,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.7.2 -Release: 13%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -120,6 +120,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Feb 14 2020 Jens Petersen - 0.8-1 +- update to 0.8 + * Tue Jan 28 2020 Fedora Release Engineering - 0.7.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 8e282d3..bc30e47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clock-0.7.2.tar.gz) = cf44dfca6c0825a003018c68266ef0fe503a9b147aaf784435f6297b365c6d18fc71b63b77a23ee2a3298ace638a35de0c6118e361d43b418a45d4fdd24d57cf +SHA512 (clock-0.8.tar.gz) = c966811e3df10d299a8c5a56f0d9ffeaea1e819516d3efb1f2454254bd828e891e579894ca4783f3249e35793b1721a4a4fae867c8e2e4d2d6519ee9abd752b9 From 293a92ec64862d3a7c63dab88d73ac5d83a9f0a1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 3 Jun 2020 18:58:07 +0800 Subject: [PATCH 18/30] tests disabled to avoid circular dep with tasty --- ghc-clock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 3a06a7e..1b49347 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -4,7 +4,7 @@ %global pkg_name clock %global pkgver %{pkg_name}-%{version} -# temporarily disable tests for ghc82 rebuilds +# disabled to avoid circular dep: clock is a dep of tasty %bcond_with tests Name: ghc-%{pkg_name} From 90223599d9683ce155751565a20e8085c6da60e2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:25:37 +0800 Subject: [PATCH 19/30] refresh to cabal-rpm-2.0.5 --- ghc-clock.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 1b49347..e0bd380 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -1,5 +1,5 @@ -# generated by cabal-rpm-2.0.2 -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.5 +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name clock %global pkgver %{pkg_name}-%{version} From 8e2c6a3a3e434a9cf75f306c93bb3f5abef2935f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:54:14 +0800 Subject: [PATCH 20/30] refresh to cabal-rpm-2.0.6 --- ghc-clock.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index e0bd380..c90978b 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 +# generated by cabal-rpm-2.0.6 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name clock @@ -89,16 +89,6 @@ This package provides the Haskell %{pkg_name} profiling library. %cabal_test -%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 f5c567ce801beada48b66052e032b15bafa7b1cb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 17:58:14 +0800 Subject: [PATCH 21/30] bump release --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index c90978b..eb00124 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -110,6 +110,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Jul 17 2020 Jens Petersen - 0.8-2 +- refresh to cabal-rpm-2.0.6 + * Fri Feb 14 2020 Jens Petersen - 0.8-1 - update to 0.8 From 97a6100a522d92d65f53dfeca1be21fed31a53ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 18:55:02 +0000 Subject: [PATCH 22/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index eb00124..792b41f 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -110,6 +110,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 0.8-2 - refresh to cabal-rpm-2.0.6 From 353d5fe2301f81a2d59656ac703b4b2fae6c1d2c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 06:59:07 +0000 Subject: [PATCH 23/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 792b41f..916d26a 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 0.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -110,6 +110,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9d04ac813ee8eeb0282ed0d9e5c1527039bfaed5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:26:18 +0000 Subject: [PATCH 24/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 916d26a..50aa3ed 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 0.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -110,6 +110,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From bd8c0506f8be8698cba7a8f9b4840f85f42b7d68 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:10 +0800 Subject: [PATCH 25/30] refresh to cabal-rpm-2.0.9 --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 50aa3ed..810e6ad 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.6 +# generated by cabal-rpm-2.0.9 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name clock @@ -50,6 +50,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. @@ -86,7 +87,9 @@ This package provides the Haskell %{pkg_name} profiling library. %check +%if %{with tests} %cabal_test +%endif %files -f %{name}.files From 819baf33944073f3b6261a59efb70e2aa6cf13e6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 01:43:31 +0800 Subject: [PATCH 26/30] update to 0.8.2 --- .gitignore | 1 + ghc-clock.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 179df0e..cf431ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /clock-0.7.2.tar.gz /clock-0.8.tar.gz +/clock-0.8.2.tar.gz diff --git a/ghc-clock.spec b/ghc-clock.spec index 810e6ad..31b8665 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -8,8 +8,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8 -Release: 5%{?dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -113,6 +113,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Aug 5 2021 Jens Petersen - 0.8.2-1 +- update to 0.8.2 + * Thu Jul 22 2021 Fedora Release Engineering - 0.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index bc30e47..d1042a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clock-0.8.tar.gz) = c966811e3df10d299a8c5a56f0d9ffeaea1e819516d3efb1f2454254bd828e891e579894ca4783f3249e35793b1721a4a4fae867c8e2e4d2d6519ee9abd752b9 +SHA512 (clock-0.8.2.tar.gz) = 42a7681ae8f1357c4ae39f51a15d7a00f3d587c8fc787d648308f914702471e6f9b32ee51fa1e8164a77f195600fdab8e27d45aa13a7052a921c4b8c246b891e From f7543e40107d31652e1b5241806bf635f07e460c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:39:02 +0000 Subject: [PATCH 27/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 31b8665..8e9f798 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 0.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -113,6 +113,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 0.8.2-1 - update to 0.8.2 From 816ec39d013e749c1e4bd0c8f4d4642acaa83d3c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 10 Mar 2022 14:55:29 +0800 Subject: [PATCH 28/30] bump release --- ghc-clock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-clock.spec b/ghc-clock.spec index 8e9f798..099e174 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 0.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -113,6 +113,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Mar 10 2022 Jens Petersen - 0.8.2-3 +- rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 5209ca144745ac06fb64abf78058f019d96d3305 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Jun 2022 13:05:29 +0800 Subject: [PATCH 29/30] update to 0.8.3 --- .gitignore | 1 + ghc-clock.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cf431ec..ade9633 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /clock-0.7.2.tar.gz /clock-0.8.tar.gz /clock-0.8.2.tar.gz +/clock-0.8.3.tar.gz diff --git a/ghc-clock.spec b/ghc-clock.spec index 099e174..2dd76a7 100644 --- a/ghc-clock.spec +++ b/ghc-clock.spec @@ -8,8 +8,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.2 -Release: 3%{?dist} +Version: 0.8.3 +Release: 1%{?dist} Summary: High-resolution clock functions: monotonic, realtime, cputime License: BSD @@ -99,6 +99,7 @@ This package provides the Haskell %{pkg_name} profiling library. %files devel -f %{name}-devel.files +%doc CHANGELOG.md %if %{with haddock} @@ -113,6 +114,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jun 07 2022 Jens Petersen - 0.8.3-1 +- https://hackage.haskell.org/package/clock-0.8.3/changelog + * Thu Mar 10 2022 Jens Petersen - 0.8.2-3 - rebuild diff --git a/sources b/sources index d1042a1..3096244 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clock-0.8.2.tar.gz) = 42a7681ae8f1357c4ae39f51a15d7a00f3d587c8fc787d648308f914702471e6f9b32ee51fa1e8164a77f195600fdab8e27d45aa13a7052a921c4b8c246b891e +SHA512 (clock-0.8.3.tar.gz) = 86424c9593b9851a3c59ceb23a1665526a0f7e47a18322aa772feff2babb8799c1c2187005639882e4a1553cc327e78a25e85ebe87dec6de17cad050b526ff6f From 430d1afc10322319a98fc720bda5737ee503ba5c Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:28:39 +0300 Subject: [PATCH 30/30] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 3096244..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (clock-0.8.3.tar.gz) = 86424c9593b9851a3c59ceb23a1665526a0f7e47a18322aa772feff2babb8799c1c2187005639882e4a1553cc327e78a25e85ebe87dec6de17cad050b526ff6f