From 3fd3d90ef68d184039b85408ff5f98db0d996860 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 16 Oct 2017 14:06:46 +0000 Subject: [PATCH 01/29] 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..25d6acb --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# ghc-time-compat + +The ghc-time-compat package \ No newline at end of file From 7fe36397734c0badb6f5af03e7d3a7561d8c2b7b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 17 Oct 2017 16:25:01 +0900 Subject: [PATCH 02/29] import (#1055838) --- .gitignore | 1 + README.md | 3 -- ghc-time-compat.spec | 68 ++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 ghc-time-compat.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7781cf5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/time-compat-0.1.0.3.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 25d6acb..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ghc-time-compat - -The ghc-time-compat package \ No newline at end of file diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec new file mode 100644 index 0000000..c294c98 --- /dev/null +++ b/ghc-time-compat.spec @@ -0,0 +1,68 @@ +# generated by cabal-rpm-0.11.2 +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name time-compat +%global pkgver %{pkg_name}-%{version} + +Name: ghc-%{pkg_name} +Version: 0.1.0.3 +Release: 1%{?dist} +Summary: Compatibility with old-time for the time package + +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-old-time-devel +BuildRequires: ghc-time-devel +# End cabal-rpm deps + +%description +Compatibility with the old-time package for the "new" time package. + + +%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 + + +%changelog +* Tue Oct 10 2017 Fedora Haskell SIG - 0.1.0.3-1 +- spec file generated by cabal-rpm-0.11.2 diff --git a/sources b/sources new file mode 100644 index 0000000..34fc5f8 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (time-compat-0.1.0.3.tar.gz) = d7034e47654c4d73b4a0f3a7b1d0d5d2bfcc1eb028f288b7ccd0baceae49a6436493bf8a7a8af34ef3668f59a8b6f6047809a448125607c8af4aaee01deacfa6 From 3034b3000c60f7a88722d8d9b893a6727cfd35ac Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 17 Oct 2017 16:32:08 +0900 Subject: [PATCH 03/29] bump release over happstack-server --- ghc-time-compat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index c294c98..6543f2e 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.1.0.3 -Release: 1%{?dist} +Release: 6%{?dist} Summary: Compatibility with old-time for the time package License: BSD @@ -64,5 +64,8 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Oct 17 2017 Jens Petersen - 0.1.0.3-6 +- bump release over happstack-server + * Tue Oct 10 2017 Fedora Haskell SIG - 0.1.0.3-1 - spec file generated by cabal-rpm-0.11.2 From 617e7690a2983ecdf7516566fed649c48ecf6e89 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:12:10 +0100 Subject: [PATCH 04/29] refresh to cabal-rpm-0.12.1 --- ghc-time-compat.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 6543f2e..648a5b8 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.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 time-compat @@ -27,9 +27,12 @@ Compatibility with the old-time package for the "new" time package. %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 @@ -48,6 +51,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 d61b35ff30b191eaa967f7b7e5795a131b765911 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Jan 2018 12:01:09 +0100 Subject: [PATCH 05/29] bump release --- ghc-time-compat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 648a5b8..c84a6c3 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.1.0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Compatibility with old-time for the time package License: BSD @@ -73,6 +73,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jan 26 2018 Jens Petersen - 0.1.0.3-7 +- rebuild + * Tue Oct 17 2017 Jens Petersen - 0.1.0.3-6 - bump release over happstack-server From 1a6c85aeb120aff2218a62b410e5ed15ca6a5762 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:03:37 +0900 Subject: [PATCH 06/29] drop ldconfig scriptlets --- ghc-time-compat.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index c84a6c3..cbbd7f5 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -51,12 +51,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 bec42400308a1339c22266207e85459d0b6bd37b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 12:15:13 +0000 Subject: [PATCH 07/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-time-compat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index cbbd7f5..41409dd 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.1.0.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Compatibility with old-time for the time package License: BSD @@ -67,6 +67,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.1.0.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Jan 26 2018 Jens Petersen - 0.1.0.3-7 - rebuild From db5e8263e01c69f01390dd0c5ff494f50c5f1da3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:12:05 +0000 Subject: [PATCH 08/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-time-compat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 41409dd..e263bef 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.1.0.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Compatibility with old-time for the time package License: BSD @@ -67,6 +67,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.1.0.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.1.0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From a2408d55af4f7b1b13ea95707b63cc230c227978 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 22:07:51 +0000 Subject: [PATCH 09/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-time-compat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index e263bef..4254eb8 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.1.0.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Compatibility with old-time for the time package License: BSD @@ -67,6 +67,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.1.0.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.1.0.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 3ed304d784017ae0c64eb209ab9d3231e1d3a230 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:47:30 +0800 Subject: [PATCH 10/29] refresh to cabal-rpm-0.13 --- ghc-time-compat.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 4254eb8..19f75b5 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.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 time-compat @@ -6,16 +6,18 @@ Name: ghc-%{pkg_name} Version: 0.1.0.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Compatibility with old-time for the time package 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-old-time-devel BuildRequires: ghc-time-devel # End cabal-rpm deps @@ -40,15 +42,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 @@ -60,13 +68,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.1.0.3-11 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.1.0.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 8fe5654435778a34af984e9c6343d9a5697a57b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:07:15 +0000 Subject: [PATCH 11/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-time-compat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 19f75b5..966bba5 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.1.0.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Compatibility with old-time for the time package License: BSD @@ -77,6 +77,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.1.0.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 0.1.0.3-11 - refresh to cabal-rpm-0.13 From 71b45ab2a6fba758cf9480aba0e25e8ae4b80153 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:26:25 +0000 Subject: [PATCH 12/29] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-time-compat.spec | 53 +++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 966bba5..95d5d9b 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.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 time-compat @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.1.0.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Compatibility with old-time for the time package License: BSD @@ -17,6 +17,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-old-time-devel BuildRequires: ghc-time-devel @@ -29,11 +35,8 @@ Compatibility with the old-time package for the "new" time package. %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} @@ -41,6 +44,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} @@ -59,14 +81,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 @@ -76,7 +90,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 +* Fri Aug 02 2019 Jens Petersen - 0.1.0.3-13 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 0.1.0.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 081a9ba807ec9d9b320ca4dbd8e10355db729e40 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:32:23 +0800 Subject: [PATCH 13/29] BR prof for lib and static for executable --- ghc-time-compat.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 95d5d9b..b3bbc6a 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.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 time-compat @@ -17,15 +17,10 @@ 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-old-time-devel -BuildRequires: ghc-time-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-old-time-prof +BuildRequires: ghc-time-prof # End cabal-rpm deps %description @@ -35,6 +30,7 @@ Compatibility with the old-time package for the "new" time package. %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 95d29598566c581fd2e001eab73b1ff5dd65ca3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:32:35 +0000 Subject: [PATCH 14/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-time-compat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index b3bbc6a..eaf97c5 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.1.0.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Compatibility with old-time for the time package License: BSD @@ -97,6 +97,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.1.0.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Aug 02 2019 Jens Petersen - 0.1.0.3-13 - add doc and prof subpackages (cabal-rpm-1.0.0) From 7d8ad605d4d77b6632f3b5d5a1166f019312b30c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:52:26 +0800 Subject: [PATCH 15/29] refresh to cabal-rpm-2.0.2 --- ghc-time-compat.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index eaf97c5..8bfbcde 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.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 time-compat @@ -43,6 +43,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. @@ -53,6 +54,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. @@ -77,6 +79,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 @@ -88,6 +100,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From b3a36cde2a4e9f4ec8b7ce96bbb3b3a50cf2ebf1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 12:07:50 +0800 Subject: [PATCH 16/29] update to 1.9.2.2 --- .gitignore | 1 + ghc-time-compat.spec | 31 +++++-- sources | 2 +- time-compat-1.9.2.2.cabal | 169 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 197 insertions(+), 6 deletions(-) create mode 100644 time-compat-1.9.2.2.cabal diff --git a/.gitignore b/.gitignore index 7781cf5..294751d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /time-compat-0.1.0.3.tar.gz +/time-compat-1.9.2.2.tar.gz diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 8bfbcde..db47d56 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -4,27 +4,40 @@ %global pkg_name time-compat %global pkgver %{pkg_name}-%{version} +%bcond_without tests + Name: ghc-%{pkg_name} -Version: 0.1.0.3 -Release: 14%{?dist} -Summary: Compatibility with old-time for the time package +Version: 1.9.2.2 +Release: 1%{?dist} +Summary: Compatibility package for time License: BSD 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/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof -BuildRequires: ghc-old-time-prof +BuildRequires: ghc-base-orphans-prof +BuildRequires: ghc-deepseq-prof BuildRequires: ghc-time-prof +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-base-compat-devel +BuildRequires: ghc-tagged-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel +%endif # End cabal-rpm deps %description -Compatibility with the old-time package for the "new" time package. +This packages tries to compat as much of 'time' features as possible. %package devel @@ -64,6 +77,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -79,6 +93,10 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm install +%check +%cabal_test + + %if 0%{?fedora} < 31 || 0%{?rhel} < 8 %post devel %ghc_pkg_recache @@ -110,6 +128,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Feb 14 2020 Jens Petersen - 1.9.2.2-1 +- update to 1.9.2.2 + * Tue Jan 28 2020 Fedora Release Engineering - 0.1.0.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 34fc5f8..c8c587b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (time-compat-0.1.0.3.tar.gz) = d7034e47654c4d73b4a0f3a7b1d0d5d2bfcc1eb028f288b7ccd0baceae49a6436493bf8a7a8af34ef3668f59a8b6f6047809a448125607c8af4aaee01deacfa6 +SHA512 (time-compat-1.9.2.2.tar.gz) = 210e1d6b6b1dcf30337c72d45dd5f229dfbd023a1612f13dccad23131f16437b2b6a43a46e5e1341751c7b6f88f8ef1a9b5efe91b1328b12ff20552e2a952f44 diff --git a/time-compat-1.9.2.2.cabal b/time-compat-1.9.2.2.cabal new file mode 100644 index 0000000..f518d4e --- /dev/null +++ b/time-compat-1.9.2.2.cabal @@ -0,0 +1,169 @@ +cabal-version: 1.12 +name: time-compat +version: 1.9.2.2 +x-revision: 2 +synopsis: Compatibility package for time +description: + This packages tries to compat as much of @time@ features as possible. + . + /TODO:/ + . + * Difference type @ParseTime@ and @FormatTime@ instances are missing. + . + * Formatting varies depending on underlying @time@ version + . + * @dayFractionToTimeOfDay@ on extreme values + +category: Time, Compatibility +license: BSD3 +license-file: LICENSE +maintainer: Oleg Grenrus +author: Ashley Yakeley +homepage: https://github.com/phadej/time-compat +bug-reports: https://github.com/phadej/time-compat/issues +build-type: Simple +tested-with: + GHC ==7.0.4 + || ==7.2.2 + || ==7.4.2 + || ==7.6.3 + || ==7.8.4 + || ==7.10.3 + || ==8.0.2 + || ==8.2.2 + || ==8.4.4 + || ==8.6.5 + || ==8.8.2 + || ==8.10.1 + +source-repository head + type: git + location: https://github.com/phadej/time-compat.git + +flag old-locale + description: If true, use old-locale, otherwise use time 1.5 or newer. + manual: False + default: False + +library + default-language: Haskell2010 + hs-source-dirs: src + other-extensions: CPP + + if impl(ghc >=7.2) + default-extensions: Trustworthy + + build-depends: + base >=4.3 && <4.15 + , base-orphans >=0.8.1 && <0.9 + , deepseq >=1.3.0.0 && <1.4 || >=1.4.1.1 && <1.5 + , time >=1.2 && <1.3 || >=1.4 && <1.7 || >=1.8 && <1.9 || >=1.9.2 && <1.9.4 + + if flag(old-locale) + build-depends: + old-locale >=1.0.0.2 && <1.1 + , time >=0 && <1.5 + + else + build-depends: time >=1.5 + + if !impl(ghc >=8.0) + build-depends: + fail >=4.9.0.0 && <4.10 + , semigroups >=0.18.5 && <0.20 + + exposed-modules: + Data.Time.Calendar.Compat + Data.Time.Calendar.Easter.Compat + Data.Time.Calendar.Julian.Compat + Data.Time.Calendar.MonthDay.Compat + Data.Time.Calendar.OrdinalDate.Compat + Data.Time.Calendar.WeekDate.Compat + Data.Time.Clock.Compat + Data.Time.Clock.POSIX.Compat + Data.Time.Clock.System.Compat + Data.Time.Clock.TAI.Compat + Data.Time.Compat + Data.Time.Format.Compat + Data.Time.Format.ISO8601.Compat + Data.Time.LocalTime.Compat + + other-modules: + Data.Format + Data.Time.Calendar.Private + Data.Time.Orphans + +test-suite instances + default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: test + main-is: Test.hs + build-depends: + base + , deepseq + , HUnit >=1.3.1 && <1.3.2 || >=1.6.0.0 && <1.7 + , time-compat + +-- This test-suite is from test library +test-suite main + if !impl(ghc >=7.4) + buildable: False + + default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: test/main + default-extensions: + CPP + DeriveDataTypeable + ExistentialQuantification + FlexibleInstances + MultiParamTypeClasses + Rank2Types + ScopedTypeVariables + StandaloneDeriving + TupleSections + UndecidableInstances + + ghc-options: -Wall -fwarn-tabs + build-depends: + base + , base-compat >=0.10.5 && <0.11 + , deepseq + , QuickCheck >=2.13 && <2.14 + , tagged >=0.8.6 && <0.9 + , tasty >=1.2.1 && <1.3 + , tasty-hunit >=0.10 && <0.11 + , tasty-quickcheck >=0.10 && <0.11 + , time-compat + + build-depends: time + main-is: Main.hs + other-modules: + Test.Arbitrary + Test.Calendar.AddDays + Test.Calendar.AddDaysRef + Test.Calendar.Calendars + Test.Calendar.CalendarsRef + Test.Calendar.ClipDates + Test.Calendar.ClipDatesRef + Test.Calendar.ConvertBack + Test.Calendar.Duration + Test.Calendar.Easter + Test.Calendar.EasterRef + Test.Calendar.LongWeekYears + Test.Calendar.LongWeekYearsRef + Test.Calendar.MonthDay + Test.Calendar.MonthDayRef + Test.Calendar.Valid + Test.Calendar.Week + Test.Clock.Conversion + Test.Clock.Resolution + Test.Clock.TAI + Test.Format.Format + Test.Format.ISO8601 + Test.Format.ParseTime + Test.LocalTime.CalendarDiffTime + Test.LocalTime.Time + Test.LocalTime.TimeOfDay + Test.LocalTime.TimeRef + Test.TestUtil From a33f1d7c812e420f7f21015aa1f566257f133ae6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 21 Feb 2020 22:29:05 +0800 Subject: [PATCH 17/29] disable testsuite - tasty hangs --- ghc-time-compat.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index db47d56..ddd3594 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -4,7 +4,8 @@ %global pkg_name time-compat %global pkgver %{pkg_name}-%{version} -%bcond_without tests +# tasty hanging +%bcond_with tests Name: ghc-%{pkg_name} Version: 1.9.2.2 From 4f08081606b617f6c4092351e92eeaa476fc33c2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:28:40 +0800 Subject: [PATCH 18/29] refresh to cabal-rpm-2.0.5 --- ghc-time-compat.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index ddd3594..39fb124 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.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 time-compat %global pkgver %{pkg_name}-%{version} From be5739e6500cd15e6112288c6203aee3a63c39ab Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 10 Jun 2020 11:56:43 +0800 Subject: [PATCH 19/29] update to 1.9.3 --- .gitignore | 1 + ghc-time-compat.spec | 8 +- sources | 2 +- time-compat-1.9.2.2.cabal | 169 -------------------------------------- 4 files changed, 7 insertions(+), 173 deletions(-) delete mode 100644 time-compat-1.9.2.2.cabal diff --git a/.gitignore b/.gitignore index 294751d..bcedb37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /time-compat-0.1.0.3.tar.gz /time-compat-1.9.2.2.tar.gz +/time-compat-1.9.3.tar.gz diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 39fb124..51aa4b2 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -8,7 +8,7 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.9.2.2 +Version: 1.9.3 Release: 1%{?dist} Summary: Compatibility package for time @@ -16,7 +16,6 @@ License: BSD 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/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -78,7 +77,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -115,6 +113,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files +%doc CHANGELOG.md %if %{with haddock} @@ -129,6 +128,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Wed Jun 10 2020 Jens Petersen - 1.9.3-1 +- update to 1.9.3 + * Fri Feb 14 2020 Jens Petersen - 1.9.2.2-1 - update to 1.9.2.2 diff --git a/sources b/sources index c8c587b..48277ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (time-compat-1.9.2.2.tar.gz) = 210e1d6b6b1dcf30337c72d45dd5f229dfbd023a1612f13dccad23131f16437b2b6a43a46e5e1341751c7b6f88f8ef1a9b5efe91b1328b12ff20552e2a952f44 +SHA512 (time-compat-1.9.3.tar.gz) = 937020b42b739a9ee2da3d8105181adc45d80f7e8b5af81c7f43dfbf567f33c81caf0e34de8896bc139f1eb4e40efd0715e9f6e5a4d542a1a86c4ea53151cf2a diff --git a/time-compat-1.9.2.2.cabal b/time-compat-1.9.2.2.cabal deleted file mode 100644 index f518d4e..0000000 --- a/time-compat-1.9.2.2.cabal +++ /dev/null @@ -1,169 +0,0 @@ -cabal-version: 1.12 -name: time-compat -version: 1.9.2.2 -x-revision: 2 -synopsis: Compatibility package for time -description: - This packages tries to compat as much of @time@ features as possible. - . - /TODO:/ - . - * Difference type @ParseTime@ and @FormatTime@ instances are missing. - . - * Formatting varies depending on underlying @time@ version - . - * @dayFractionToTimeOfDay@ on extreme values - -category: Time, Compatibility -license: BSD3 -license-file: LICENSE -maintainer: Oleg Grenrus -author: Ashley Yakeley -homepage: https://github.com/phadej/time-compat -bug-reports: https://github.com/phadej/time-compat/issues -build-type: Simple -tested-with: - GHC ==7.0.4 - || ==7.2.2 - || ==7.4.2 - || ==7.6.3 - || ==7.8.4 - || ==7.10.3 - || ==8.0.2 - || ==8.2.2 - || ==8.4.4 - || ==8.6.5 - || ==8.8.2 - || ==8.10.1 - -source-repository head - type: git - location: https://github.com/phadej/time-compat.git - -flag old-locale - description: If true, use old-locale, otherwise use time 1.5 or newer. - manual: False - default: False - -library - default-language: Haskell2010 - hs-source-dirs: src - other-extensions: CPP - - if impl(ghc >=7.2) - default-extensions: Trustworthy - - build-depends: - base >=4.3 && <4.15 - , base-orphans >=0.8.1 && <0.9 - , deepseq >=1.3.0.0 && <1.4 || >=1.4.1.1 && <1.5 - , time >=1.2 && <1.3 || >=1.4 && <1.7 || >=1.8 && <1.9 || >=1.9.2 && <1.9.4 - - if flag(old-locale) - build-depends: - old-locale >=1.0.0.2 && <1.1 - , time >=0 && <1.5 - - else - build-depends: time >=1.5 - - if !impl(ghc >=8.0) - build-depends: - fail >=4.9.0.0 && <4.10 - , semigroups >=0.18.5 && <0.20 - - exposed-modules: - Data.Time.Calendar.Compat - Data.Time.Calendar.Easter.Compat - Data.Time.Calendar.Julian.Compat - Data.Time.Calendar.MonthDay.Compat - Data.Time.Calendar.OrdinalDate.Compat - Data.Time.Calendar.WeekDate.Compat - Data.Time.Clock.Compat - Data.Time.Clock.POSIX.Compat - Data.Time.Clock.System.Compat - Data.Time.Clock.TAI.Compat - Data.Time.Compat - Data.Time.Format.Compat - Data.Time.Format.ISO8601.Compat - Data.Time.LocalTime.Compat - - other-modules: - Data.Format - Data.Time.Calendar.Private - Data.Time.Orphans - -test-suite instances - default-language: Haskell2010 - type: exitcode-stdio-1.0 - hs-source-dirs: test - main-is: Test.hs - build-depends: - base - , deepseq - , HUnit >=1.3.1 && <1.3.2 || >=1.6.0.0 && <1.7 - , time-compat - --- This test-suite is from test library -test-suite main - if !impl(ghc >=7.4) - buildable: False - - default-language: Haskell2010 - type: exitcode-stdio-1.0 - hs-source-dirs: test/main - default-extensions: - CPP - DeriveDataTypeable - ExistentialQuantification - FlexibleInstances - MultiParamTypeClasses - Rank2Types - ScopedTypeVariables - StandaloneDeriving - TupleSections - UndecidableInstances - - ghc-options: -Wall -fwarn-tabs - build-depends: - base - , base-compat >=0.10.5 && <0.11 - , deepseq - , QuickCheck >=2.13 && <2.14 - , tagged >=0.8.6 && <0.9 - , tasty >=1.2.1 && <1.3 - , tasty-hunit >=0.10 && <0.11 - , tasty-quickcheck >=0.10 && <0.11 - , time-compat - - build-depends: time - main-is: Main.hs - other-modules: - Test.Arbitrary - Test.Calendar.AddDays - Test.Calendar.AddDaysRef - Test.Calendar.Calendars - Test.Calendar.CalendarsRef - Test.Calendar.ClipDates - Test.Calendar.ClipDatesRef - Test.Calendar.ConvertBack - Test.Calendar.Duration - Test.Calendar.Easter - Test.Calendar.EasterRef - Test.Calendar.LongWeekYears - Test.Calendar.LongWeekYearsRef - Test.Calendar.MonthDay - Test.Calendar.MonthDayRef - Test.Calendar.Valid - Test.Calendar.Week - Test.Clock.Conversion - Test.Clock.Resolution - Test.Clock.TAI - Test.Format.Format - Test.Format.ISO8601 - Test.Format.ParseTime - Test.LocalTime.CalendarDiffTime - Test.LocalTime.Time - Test.LocalTime.TimeOfDay - Test.LocalTime.TimeRef - Test.TestUtil From e14a75f022e86bbd3bc4c89c34b28569d6bf3c41 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:57:18 +0800 Subject: [PATCH 20/29] refresh to cabal-rpm-2.0.6 --- ghc-time-compat.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 51aa4b2..4dfa6af 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.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 time-compat @@ -96,16 +96,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 e46ffd2286fff9b0a5e8362afc3af5b1bbf00915 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:46:20 +0000 Subject: [PATCH 21/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-time-compat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 4dfa6af..342fc1f 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 1.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compatibility package for time License: BSD @@ -118,6 +118,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jun 10 2020 Jens Petersen - 1.9.3-1 - update to 1.9.3 From 719b77a4891943fb366cbaec118eaaf500e4659f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:35:59 +0000 Subject: [PATCH 22/29] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-time-compat.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 342fc1f..5503363 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 1.9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compatibility package for time License: BSD @@ -118,6 +118,10 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.9.3-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.9.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e91a6b91be77fe1bddc3624be6f16ab89473a071 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:50:09 +0000 Subject: [PATCH 23/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-time-compat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 5503363..e147f3c 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 1.9.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Compatibility package for time License: BSD @@ -118,6 +118,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.9.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 1.9.3-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9c3821c10d0e5246d5904164709e64e874f288a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:22:16 +0000 Subject: [PATCH 24/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-time-compat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index e147f3c..ce23cf1 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 1.9.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Compatibility package for time License: BSD @@ -118,6 +118,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.9.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.9.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2b56d018fd906cd1471b1f4a15eaa2151134a52b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 12:56:39 +0800 Subject: [PATCH 25/29] update to 1.9.5 --- .gitignore | 1 + ghc-time-compat.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bcedb37..981faa8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /time-compat-0.1.0.3.tar.gz /time-compat-1.9.2.2.tar.gz /time-compat-1.9.3.tar.gz +/time-compat-1.9.5.tar.gz diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index ce23cf1..44d32d5 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -8,8 +8,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.9.3 -Release: 5%{?dist} +Version: 1.9.5 +Release: 1%{?dist} Summary: Compatibility package for time License: BSD @@ -118,6 +118,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Aug 5 2021 Jens Petersen - 1.9.5-1 +- update to 1.9.5 + * Thu Jul 22 2021 Fedora Release Engineering - 1.9.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 48277ba..49765ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (time-compat-1.9.3.tar.gz) = 937020b42b739a9ee2da3d8105181adc45d80f7e8b5af81c7f43dfbf567f33c81caf0e34de8896bc139f1eb4e40efd0715e9f6e5a4d542a1a86c4ea53151cf2a +SHA512 (time-compat-1.9.5.tar.gz) = c5e61242140c5bca4ca3b8e6f9f1058128cce40ac77ed3009a82d511b3ac9c0a2423bf0de1369c49e65a22fb8d864b1c9351994730951e5e302c5d17f131db83 From ff4e2ea5b3e9b5554764cad650d65c8746293bd7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:14 +0800 Subject: [PATCH 26/29] refresh to cabal-rpm-2.0.9 --- ghc-time-compat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 44d32d5..885b6ab 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.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 time-compat @@ -57,6 +57,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. @@ -93,7 +94,9 @@ This package provides the Haskell %{pkg_name} profiling library. %check +%if %{with tests} %cabal_test +%endif %files -f %{name}.files From d5f2df4b78216de6c90685c96e12457f3f31d674 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 4 Aug 2021 22:29:12 +0800 Subject: [PATCH 27/29] revise .cabal --- ghc-time-compat.spec | 2 + time-compat-1.9.5.cabal | 188 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 190 insertions(+) create mode 100644 time-compat-1.9.5.cabal diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 885b6ab..7091fa5 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -16,6 +16,7 @@ License: BSD 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/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -78,6 +79,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup diff --git a/time-compat-1.9.5.cabal b/time-compat-1.9.5.cabal new file mode 100644 index 0000000..92f0eab --- /dev/null +++ b/time-compat-1.9.5.cabal @@ -0,0 +1,188 @@ +cabal-version: 1.12 +name: time-compat +version: 1.9.5 +x-revision: 1 +synopsis: Compatibility package for time +description: + This packages tries to compat as much of @time@ features as possible. + . + /TODO:/ + . + * Difference type @ParseTime@ and @FormatTime@ instances are missing. + . + * Formatting varies depending on underlying @time@ version + . + * @dayFractionToTimeOfDay@ on extreme values + +category: Time, Compatibility +license: BSD3 +license-file: LICENSE +maintainer: Oleg Grenrus +author: Ashley Yakeley +homepage: https://github.com/haskellari/time-compat +bug-reports: https://github.com/haskellari/time-compat/issues +build-type: Simple +extra-source-files: CHANGELOG.md +tested-with: + GHC ==7.0.4 + || ==7.2.2 + || ==7.4.2 + || ==7.6.3 + || ==7.8.4 + || ==7.10.3 + || ==8.0.2 + || ==8.2.2 + || ==8.4.4 + || ==8.6.5 + || ==8.8.4 + || ==8.10.3 + +source-repository head + type: git + location: https://github.com/haskellari/time-compat.git + +flag old-locale + description: If true, use old-locale, otherwise use time 1.5 or newer. + manual: False + default: False + +library + default-language: Haskell2010 + hs-source-dirs: src + other-extensions: CPP + + if impl(ghc >=7.2) + default-extensions: Trustworthy + + build-depends: + base >=4.3 && <4.16 + , base-orphans >=0.8.1 && <0.9 + , deepseq >=1.3.0.0 && <1.4 || >=1.4.1.1 && <1.5 + , time >=1.2 && <1.3 || >=1.4 && <1.7 || >=1.8 && <1.9 || >=1.9.2 && <1.9.4 || >=1.10 && <1.10.1 || >=1.11 && <1.11.2 + + if flag(old-locale) + build-depends: + old-locale >=1.0.0.2 && <1.1 + , time >=0 && <1.5 + + else + build-depends: time >=1.5 + + if !impl(ghc >=8.0) + build-depends: + fail >=4.9.0.0 && <4.10 + , semigroups >=0.18.5 && <0.20 + + exposed-modules: + Data.Time.Calendar.Compat + Data.Time.Calendar.Easter.Compat + Data.Time.Calendar.Julian.Compat + Data.Time.Calendar.Month.Compat + Data.Time.Calendar.MonthDay.Compat + Data.Time.Calendar.OrdinalDate.Compat + Data.Time.Calendar.Quarter.Compat + Data.Time.Calendar.WeekDate.Compat + Data.Time.Clock.Compat + Data.Time.Clock.POSIX.Compat + Data.Time.Clock.System.Compat + Data.Time.Clock.TAI.Compat + Data.Time.Compat + Data.Time.Format.Compat + Data.Time.Format.ISO8601.Compat + Data.Time.LocalTime.Compat + + other-modules: + Data.Format + Data.Time.Calendar.Private + Data.Time.Calendar.Types + Data.Time.Orphans + +test-suite instances + default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: test-instances + main-is: Test.hs + build-depends: + base + , deepseq + , HUnit >=1.3.1 && <1.3.2 || >=1.6.0.0 && <1.7 + , time-compat + +-- This test-suite is from time library +-- Changes: +-- * imports: Data.Time -> Data.Time.Compat etc +-- * disabled Test.Format.ParseTime +-- * Test.Format.Format has also trees disabled +-- * Test.Format.Compile doesn't work +-- * disabled 'TimeOfDay minBound 0 0' (Test.LocalTime.Time) +-- +test-suite main + if !impl(ghc >=7.4) + buildable: False + + default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: test/main + default-extensions: + CPP + DeriveDataTypeable + ExistentialQuantification + FlexibleInstances + MultiParamTypeClasses + Rank2Types + ScopedTypeVariables + StandaloneDeriving + TupleSections + UndecidableInstances + + ghc-options: -Wall -fwarn-tabs + build-depends: + base + , base-compat >=0.10.5 && <0.12 + , deepseq + , QuickCheck >=2.13 && <2.15 + , tagged >=0.8.6 && <0.9 + , tasty >=1.2.1 && <1.5 + , tasty-hunit >=0.10 && <0.11 + , tasty-quickcheck >=0.10 && <0.11 + , time-compat + + if !impl(ghc >=8.0) + build-depends: + fail >=4.9.0.0 && <4.10 + , semigroups >=0.18.5 && <0.20 + + build-depends: time + main-is: Main.hs + other-modules: + Test.Arbitrary + Test.Calendar.AddDays + Test.Calendar.AddDaysRef + Test.Calendar.CalendarProps + Test.Calendar.Calendars + Test.Calendar.CalendarsRef + Test.Calendar.ClipDates + Test.Calendar.ClipDatesRef + Test.Calendar.ConvertBack + Test.Calendar.Duration + Test.Calendar.Easter + Test.Calendar.EasterRef + Test.Calendar.LongWeekYears + Test.Calendar.LongWeekYearsRef + Test.Calendar.MonthDay + Test.Calendar.MonthDayRef + Test.Calendar.Valid + Test.Calendar.Week + Test.Clock.Conversion + Test.Clock.Resolution + Test.Clock.TAI + Test.Format.Compile + Test.Format.Format + Test.Format.ISO8601 + Test.Format.ParseTime + Test.LocalTime.CalendarDiffTime + Test.LocalTime.Time + Test.LocalTime.TimeOfDay + Test.LocalTime.TimeRef + Test.TestUtil + Test.Types From f4b60d2df8cc329498c262bd70e346e3f434637b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:40:45 +0000 Subject: [PATCH 28/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-time-compat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 7091fa5..949c3c7 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 1.9.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compatibility package for time License: BSD @@ -123,6 +123,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.9.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 1.9.5-1 - update to 1.9.5 From efb8ade255997c393e26d85479718d70a36b45d9 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 22:04:28 +0300 Subject: [PATCH 29/29] 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 49765ce..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (time-compat-1.9.5.tar.gz) = c5e61242140c5bca4ca3b8e6f9f1058128cce40ac77ed3009a82d511b3ac9c0a2423bf0de1369c49e65a22fb8d864b1c9351994730951e5e302c5d17f131db83