From bfd3fbb8d2dc8ac9718f6a1c02c4ec2181303505 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 4 Sep 2017 18:44:39 +0000 Subject: [PATCH 01/28] 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..6888cd3 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# ghc-hourglass + +The ghc-hourglass package \ No newline at end of file From 8429a12024fdc0bec4e951e82e7974d4fe016a39 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 4 Sep 2017 19:07:44 -0400 Subject: [PATCH 02/28] Initial import (#1487893). --- .gitignore | 1 + README.md | 3 -- ghc-hourglass.spec | 116 +++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 ghc-hourglass.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1fff1c8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/hourglass-0.2.10.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 6888cd3..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ghc-hourglass - -The ghc-hourglass package \ No newline at end of file diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec new file mode 100644 index 0000000..ff4ac75 --- /dev/null +++ b/ghc-hourglass.spec @@ -0,0 +1,116 @@ +# generated by cabal-rpm-0.11.2 +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name hourglass +%global pkgver %{pkg_name}-%{version} + +%bcond_with tests + +Name: ghc-%{pkg_name} +Version: 0.2.10 +Release: 5.git.0.bd7deb5%{?dist} +Summary: Simple performant time related library + +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: +BuildRequires: ghc-deepseq-devel +%if %{with tests} +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-old-locale-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel +BuildRequires: ghc-time-devel +%endif +# End cabal-rpm deps + +%description +Simple time library focusing on simple but powerful and performant API + +The backbone of the library are the Timeable and Time type classes. + +Each Timeable instances can be converted to type that has a Time instances, and +thus are different representations of current time. + + +%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. + + +%package devel-doc +Summary: Haskell %{pkg_name} library development documentation + +BuildArch: noarch + +%description devel-doc +This package provides the Haskell %{pkg_name} library development +documentation. + + +%prep +%setup -q -n %{pkgver} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install +grep -v "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-nodoc.files +grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-doc.files + + +%check +%cabal_test + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%license LICENSE + + +%files devel -f %{name}-devel-nodoc.files +%doc CHANGELOG.md README.md + + +%files devel-doc -f %{name}-devel-doc.files +%doc CHANGELOG.md README.md + + +%changelog +* Sun Sep 03 2017 Elliott Sales de Andrade 0.2.10-5 +- Split documentation into separate subpackage. +- Update to latest spec template. + +* Mon Jul 17 2017 Elliott Sales de Andrade 0.2.10-4 +- Re-add dist tag to release numbers. + +* Mon Jul 17 2017 Elliott Sales de Andrade 0.2.10-3 +- Bump for Fedora 26. + +* Thu Dec 15 2016 Elliott Sales de Andrade - 0.2.10-2 +- Update release to be newer than previous builds + +* Thu Dec 15 2016 Fedora Haskell SIG - 0.2.10-1 +- spec file generated by cabal-rpm-0.10.0 diff --git a/sources b/sources new file mode 100644 index 0000000..b7d5ee1 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (hourglass-0.2.10.tar.gz) = 49287fa4b1f102a3a4b744bc57e109a3c1bc472f65d2e2c0e76749bf6c7abc4279af3ce7035ca9b87b373e65956069472285ac849819fc9e928cd409f33e6244 From 5ff742e090089818e59bcb2c06562d2c45515c6a Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 4 Sep 2017 19:08:54 -0400 Subject: [PATCH 03/28] Fix release number. --- ghc-hourglass.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index ff4ac75..81c5953 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.10 -Release: 5.git.0.bd7deb5%{?dist} +Release: 5%{?dist} Summary: Simple performant time related library License: BSD From a3fd05a7267ef6e06e50ce0d844e01ddd9b764f8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:11:18 +0100 Subject: [PATCH 04/28] refresh to cabal-rpm-0.12.1 --- ghc-hourglass.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 81c5953..46fb817 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.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 hourglass @@ -41,9 +41,12 @@ thus are different representations of current time. %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 @@ -78,6 +81,12 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From f7b8abd2844f2c95fb5e740a9585ca043c26f391 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Jan 2018 11:38:21 +0100 Subject: [PATCH 05/28] bump release --- ghc-hourglass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 46fb817..603b795 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Simple performant time related library License: BSD @@ -108,6 +108,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Fri Jan 26 2018 Jens Petersen - 0.2.10-6 +- rebuild + * Sun Sep 03 2017 Elliott Sales de Andrade 0.2.10-5 - Split documentation into separate subpackage. - Update to latest spec template. From 6bc09d238989b104dff5df4a228575ec7ed33a32 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:02:43 +0900 Subject: [PATCH 06/28] drop ldconfig scriptlets --- ghc-hourglass.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 603b795..43d444c 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -81,12 +81,6 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 5c46357476c0f171e3d4eddc3e9cafa22cf90f96 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:44:43 +0000 Subject: [PATCH 07/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-hourglass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 43d444c..68044f0 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Simple performant time related library License: BSD @@ -102,6 +102,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.2.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Jan 26 2018 Jens Petersen - 0.2.10-6 - rebuild From 1efc3c941154aca39af6e0ab5793b9d859adc0f5 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 9 Jul 2018 01:01:47 -0400 Subject: [PATCH 08/28] update to 0.2.11 --- .gitignore | 1 + ghc-hourglass.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1fff1c8..6b5cc84 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /hourglass-0.2.10.tar.gz +/hourglass-0.2.11.tar.gz diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 68044f0..40ccf8d 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.2.10 -Release: 7%{?dist} +Version: 0.2.11 +Release: 1%{?dist} Summary: Simple performant time related library License: BSD @@ -102,6 +102,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Mon Jul 09 2018 Elliott Sales de Andrade - 0.2.11-1 +- update to 0.2.11 + * Wed Feb 07 2018 Fedora Release Engineering - 0.2.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index b7d5ee1..8a0a534 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hourglass-0.2.10.tar.gz) = 49287fa4b1f102a3a4b744bc57e109a3c1bc472f65d2e2c0e76749bf6c7abc4279af3ce7035ca9b87b373e65956069472285ac849819fc9e928cd409f33e6244 +SHA512 (hourglass-0.2.11.tar.gz) = 6af3357be50b5645d8b0c5ec78d924981375c6a6215ee1f9e2a8a3775bab34989829cbec210c5c6c10fd39d14a8b4ed960c3ce46a354e6969414a9177460a9d1 From cb868ca7f297db84f1ff37474e3d72c4f500f231 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 01:51:55 +0000 Subject: [PATCH 09/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-hourglass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 40ccf8d..9ea3e5b 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple performant time related library License: BSD @@ -102,6 +102,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.2.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 09 2018 Elliott Sales de Andrade - 0.2.11-1 - update to 0.2.11 From 795be5d26c4e547f729235a72151e9a60a9320e4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 13 Sep 2018 18:50:47 +0900 Subject: [PATCH 10/28] fix build when haddock disabled --- ghc-hourglass.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 9ea3e5b..d2ecefd 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -74,7 +74,9 @@ documentation. %install %ghc_lib_install grep -v "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-nodoc.files +%if %{undefined without_haddock} grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-doc.files +%endif %check @@ -97,8 +99,10 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %doc CHANGELOG.md README.md +%if %{undefined without_haddock} %files devel-doc -f %{name}-devel-doc.files %doc CHANGELOG.md README.md +%endif %changelog From ffa3906404dbe9bedc52ea75a8ff478e1ebef44c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:37:41 +0000 Subject: [PATCH 11/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-hourglass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index d2ecefd..fdbff0f 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple performant time related library License: BSD @@ -106,6 +106,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.2.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.2.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 4ee32a1b78c193c33bb615bb6507f8f381d6d409 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:45:06 +0800 Subject: [PATCH 12/28] refresh to cabal-rpm-0.13 --- ghc-hourglass.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index fdbff0f..6e6688a 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.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 hourglass @@ -8,16 +8,18 @@ Name: ghc-%{pkg_name} Version: 0.2.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple performant time related library 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: BuildRequires: ghc-deepseq-devel %if %{with tests} BuildRequires: ghc-mtl-devel @@ -64,15 +66,21 @@ documentation. %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 grep -v "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-nodoc.files %if %{undefined without_haddock} grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-doc.files @@ -92,7 +100,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel-nodoc.files @@ -106,6 +116,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Sun Feb 17 2019 Jens Petersen - 0.2.11-4 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.2.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 684b0d1ac5bdd9f2caa542581b2a7ab61b743e51 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 21 Feb 2019 10:28:58 +0800 Subject: [PATCH 13/28] update to 0.2.12 --- .gitignore | 1 + ghc-hourglass.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6b5cc84..25dc452 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /hourglass-0.2.10.tar.gz /hourglass-0.2.11.tar.gz +/hourglass-0.2.12.tar.gz diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 6e6688a..1fbb033 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.2.11 -Release: 4%{?dist} +Version: 0.2.12 +Release: 1%{?dist} Summary: Simple performant time related library License: BSD @@ -116,6 +116,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Thu Feb 21 2019 Jens Petersen - 0.2.12-1 +- update to 0.2.12 + * Sun Feb 17 2019 Jens Petersen - 0.2.11-4 - refresh to cabal-rpm-0.13 diff --git a/sources b/sources index 8a0a534..53e5d3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hourglass-0.2.11.tar.gz) = 6af3357be50b5645d8b0c5ec78d924981375c6a6215ee1f9e2a8a3775bab34989829cbec210c5c6c10fd39d14a8b4ed960c3ce46a354e6969414a9177460a9d1 +SHA512 (hourglass-0.2.12.tar.gz) = c748d7f875ca0b1ea9034dba1a5cfa3fc4e51613ce24c90b54856fdc385d9ccc5eda3559f1674abf3ea966cc7851891dfee86bad897062a97a79db8408574bdc From 4e2ae6c19e4ac295a67e47999194135cb0db5d0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:34:56 +0000 Subject: [PATCH 14/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-hourglass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 1fbb033..ecc27e6 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple performant time related library License: BSD @@ -116,6 +116,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.2.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 21 2019 Jens Petersen - 0.2.12-1 - update to 0.2.12 From 8dfa838a64a17853268349c67f801ec1980990f5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:23:50 +0000 Subject: [PATCH 15/28] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-hourglass.spec | 62 ++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index ecc27e6..4efd9e4 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.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 hourglass @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple performant time related library License: BSD @@ -19,6 +19,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 BuildRequires: ghc-deepseq-devel %if %{with tests} @@ -43,11 +49,8 @@ thus are different representations of current time. %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} @@ -55,14 +58,24 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. -%package devel-doc -Summary: Haskell %{pkg_name} library development documentation +%if %{with haddock} +%package doc +Summary: Haskell %{pkg_name} library documentation +Obsoletes: %{name}-devel-doc < %{version}-%{release} + +%description doc +This package provides the Haskell %{pkg_name} library documentation. +%endif + -BuildArch: noarch +%if %{with ghc_prof} +%package prof +Summary: Haskell %{pkg_name} profiling library +Requires: %{name}-devel%{?_isa} = %{version}-%{release} -%description devel-doc -This package provides the Haskell %{pkg_name} library development -documentation. +%description prof +This package provides the Haskell %{pkg_name} profiling library. +%endif %prep @@ -81,41 +94,36 @@ documentation. # Begin cabal-rpm install %ghc_lib_install # End cabal-rpm install -grep -v "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-nodoc.files -%if %{undefined without_haddock} -grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-doc.files -%endif %check %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE # End cabal-rpm files -%files devel -f %{name}-devel-nodoc.files +%files devel -f %{name}-devel.files %doc CHANGELOG.md README.md -%if %{undefined without_haddock} -%files devel-doc -f %{name}-devel-doc.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 +* Fri Aug 02 2019 Jens Petersen - 0.2.12-3 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 0.2.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1af038194c12742da54c4506d362d5f9df328fb2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:29:46 +0800 Subject: [PATCH 16/28] BR prof for lib and static for executable --- ghc-hourglass.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 4efd9e4..5869e2f 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.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 hourglass @@ -19,14 +19,9 @@ 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-deepseq-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-deepseq-prof %if %{with tests} BuildRequires: ghc-mtl-devel BuildRequires: ghc-old-locale-devel @@ -49,6 +44,7 @@ thus are different representations of current time. %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 26784273e450d0eaf162c925e3615ecd334a6c98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:51:16 +0000 Subject: [PATCH 17/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-hourglass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 5869e2f..7b82b31 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple performant time related library License: BSD @@ -117,6 +117,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.2.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Aug 02 2019 Jens Petersen - 0.2.12-3 - add doc and prof subpackages (cabal-rpm-1.0.0) From 1811c9b9b435f8164f1bbeee2c88ea850de2800a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 6 Feb 2020 23:04:22 +0800 Subject: [PATCH 18/28] refresh to cabal-rpm-2.0.2 --- ghc-hourglass.spec | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 7b82b31..aadbd7d 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -1,14 +1,14 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name hourglass %global pkgver %{pkg_name}-%{version} -%bcond_with tests +%bcond_without tests Name: ghc-%{pkg_name} Version: 0.2.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple performant time related library License: BSD @@ -57,6 +57,7 @@ This package provides the Haskell %{pkg_name} library development files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch Obsoletes: %{name}-devel-doc < %{version}-%{release} %description doc @@ -68,6 +69,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. @@ -96,6 +98,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 @@ -108,6 +120,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif @@ -117,6 +130,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Wed Feb 19 2020 Jens Petersen - 0.2.12-5 +- refresh to cabal-rpm-2.0.2 + * Tue Jan 28 2020 Fedora Release Engineering - 0.2.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From c3950745fefee4804012e1ffcd33c589369f02ef Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:26:48 +0800 Subject: [PATCH 19/28] refresh to cabal-rpm-2.0.5 --- ghc-hourglass.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index aadbd7d..6b672bb 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.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 hourglass %global pkgver %{pkg_name}-%{version} From 29abed75048a1c796ed819f0961fbd7aaf1e1d81 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:55:25 +0800 Subject: [PATCH 20/28] refresh to cabal-rpm-2.0.6 --- ghc-hourglass.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 6b672bb..7a65594 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.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 hourglass @@ -98,16 +98,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 051b4d7c60b2ac52081d5eccb50f67a5b9011de4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 18:15:40 +0800 Subject: [PATCH 21/28] bump release --- ghc-hourglass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 7a65594..d1d6552 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.12 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Simple performant time related library License: BSD @@ -120,6 +120,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Jul 17 2020 Jens Petersen - 0.2.12-6 +- refresh to cabal-rpm-2.0.6 + * Wed Feb 19 2020 Jens Petersen - 0.2.12-5 - refresh to cabal-rpm-2.0.2 From c53fc17533f091d3528fb58b942ab580c529c78b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:14:46 +0000 Subject: [PATCH 22/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-hourglass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index d1d6552..4c2fa1d 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.12 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Simple performant time related library License: BSD @@ -120,6 +120,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.2.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 0.2.12-6 - refresh to cabal-rpm-2.0.6 From bc67134d5e97e6df22ff1d449ecf319683d2453d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:18:34 +0000 Subject: [PATCH 23/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-hourglass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 4c2fa1d..c27e5aa 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.12 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Simple performant time related library License: BSD @@ -120,6 +120,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.2.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.2.12-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d6867ac24058b0f913d13dda666194a5b97cc616 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:47:07 +0000 Subject: [PATCH 24/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-hourglass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index c27e5aa..716811b 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.12 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Simple performant time related library License: BSD @@ -120,6 +120,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.2.12-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.2.12-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From f594314940a53a2a340c00c242e3a0eecdff02d2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:11 +0800 Subject: [PATCH 25/28] refresh to cabal-rpm-2.0.9 --- ghc-hourglass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 716811b..85f31fb 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.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 hourglass @@ -58,6 +58,7 @@ This package provides the Haskell %{pkg_name} library development files. %package doc Summary: Haskell %{pkg_name} library documentation BuildArch: noarch +Requires: ghc-filesystem Obsoletes: %{name}-devel-doc < %{version}-%{release} %description doc @@ -95,7 +96,9 @@ This package provides the Haskell %{pkg_name} profiling library. %check +%if %{with tests} %cabal_test +%endif %files -f %{name}.files From 6288f5141360b28c3ebc5c7b551ce86672bb1724 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Aug 2021 11:25:38 +0800 Subject: [PATCH 26/28] bump release --- ghc-hourglass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 85f31fb..3b07414 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.12 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Simple performant time related library License: BSD @@ -123,6 +123,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Aug 06 2021 Jens Petersen - 0.2.12-10 +- rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.2.12-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f3bf7191bbba0ec5e6569e78a3182a610ce302d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:00:54 +0000 Subject: [PATCH 27/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-hourglass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 3b07414..e7feac0 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.12 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Simple performant time related library License: BSD @@ -123,6 +123,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.2.12-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Aug 06 2021 Jens Petersen - 0.2.12-10 - rebuild From 7558144c719661ef0635969f214f729308e99e3a Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:41:16 +0300 Subject: [PATCH 28/28] 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 53e5d3b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (hourglass-0.2.12.tar.gz) = c748d7f875ca0b1ea9034dba1a5cfa3fc4e51613ce24c90b54856fdc385d9ccc5eda3559f1674abf3ea966cc7851891dfee86bad897062a97a79db8408574bdc