From 44acaecd82a361aa481be0ac2fe65308b2e3ec36 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 10 Oct 2017 13:19:18 +0000 Subject: [PATCH 01/31] 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..e0c6cf7 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# ghc-doctemplates + +The ghc-doctemplates package \ No newline at end of file From 68e471d9550e865e99b820b22e14ec9e66a9970f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 15 Oct 2017 02:02:37 +0900 Subject: [PATCH 02/31] import (#1414807) --- .gitignore | 1 + README.md | 3 -- ghc-doctemplates.spec | 90 +++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 ghc-doctemplates.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6b38156 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/doctemplates-0.1.0.2.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index e0c6cf7..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ghc-doctemplates - -The ghc-doctemplates package \ No newline at end of file diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec new file mode 100644 index 0000000..80863e0 --- /dev/null +++ b/ghc-doctemplates.spec @@ -0,0 +1,90 @@ +# generated by cabal-rpm-0.11 +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name doctemplates + +%bcond_with tests + +Name: ghc-%{pkg_name} +Version: 0.1.0.2 +Release: 1%{?dist} +Summary: Pandoc-style document templates + +License: BSD +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz + +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-blaze-html-devel +BuildRequires: ghc-blaze-markup-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-parsec-devel +BuildRequires: ghc-scientific-devel +BuildRequires: ghc-text-devel +BuildRequires: ghc-unordered-containers-devel +BuildRequires: ghc-vector-devel +%if %{with tests} +BuildRequires: ghc-hspec-devel +%endif +# End cabal-rpm deps + +%description +This is the templating system used by pandoc. It was formerly +a module in pandoc. It has been split off to make it easier +to use independently. + + +%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 %{pkg_name}-%{version} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + +rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/README.md + + +%check +%cabal_test + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%license LICENSE +%{_datadir}/%{pkg_name}-%{version} + + +%files devel -f %{name}-devel.files +%doc README.md + + +%changelog +* Thu Jan 19 2017 Fedora Haskell SIG - 0.1.0.2-1 +- spec file generated by cabal-rpm-0.11 diff --git a/sources b/sources new file mode 100644 index 0000000..fc9aab9 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (doctemplates-0.1.0.2.tar.gz) = 043cc1ff32c7b1b9ac2d528d647c08769ec6ffbf3cbf080422b6f435737030ed4085735ab9c1974bbae87099a31614b66ae800fefab7120e9add5ab03815c430 From 9881e10bff5dd70b09a07f06f18f16c9292f9700 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 15 Oct 2017 02:11:18 +0900 Subject: [PATCH 03/31] update to latest packaging --- ghc-doctemplates.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 80863e0..e4504d5 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -1,18 +1,19 @@ -# generated by cabal-rpm-0.11 +# generated by cabal-rpm-0.11.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name doctemplates +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} Version: 0.1.0.2 -Release: 1%{?dist} +Release: 4%{?dist} Summary: Pandoc-style document templates License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -51,7 +52,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} %build @@ -61,7 +62,7 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install -rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/README.md +rm %{buildroot}%{_datadir}/%{pkgver}/README.md %check @@ -78,7 +79,6 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/README.md %files -f %{name}.files %license LICENSE -%{_datadir}/%{pkg_name}-%{version} %files devel -f %{name}-devel.files @@ -86,5 +86,8 @@ rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/README.md %changelog +* Sat Oct 14 2017 Jens Petersen - 0.1.0.2-4 +- refresh to cabal-rpm-0.11.2 + * Thu Jan 19 2017 Fedora Haskell SIG - 0.1.0.2-1 - spec file generated by cabal-rpm-0.11 From f530b2ab4639e448d94a7af15e0efdbc29d1fb37 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:11:01 +0100 Subject: [PATCH 04/31] refresh to cabal-rpm-0.12.1 --- ghc-doctemplates.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index e4504d5..fc03384 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -1,10 +1,10 @@ -# generated by cabal-rpm-0.11.2 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name doctemplates %global pkgver %{pkg_name}-%{version} -%bcond_with tests +%bcond_without tests Name: ghc-%{pkg_name} Version: 0.1.0.2 @@ -42,9 +42,12 @@ to use independently. %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 @@ -69,6 +72,12 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From 5f3ba2e3943cc3d609331d3249776e3882133a10 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:28:44 +0100 Subject: [PATCH 05/31] update to 0.2.1 --- .gitignore | 1 + ghc-doctemplates.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6b38156..89d9baf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /doctemplates-0.1.0.2.tar.gz +/doctemplates-0.2.1.tar.gz diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index fc03384..221b031 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -7,8 +7,8 @@ %bcond_without tests Name: ghc-%{pkg_name} -Version: 0.1.0.2 -Release: 4%{?dist} +Version: 0.2.1 +Release: 1%{?dist} Summary: Pandoc-style document templates License: BSD @@ -95,6 +95,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %changelog +* Wed Jan 24 2018 Jens Petersen - 0.2.1-1 +- update to 0.2.1 + * Sat Oct 14 2017 Jens Petersen - 0.1.0.2-4 - refresh to cabal-rpm-0.11.2 diff --git a/sources b/sources index fc9aab9..0b6892c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (doctemplates-0.1.0.2.tar.gz) = 043cc1ff32c7b1b9ac2d528d647c08769ec6ffbf3cbf080422b6f435737030ed4085735ab9c1974bbae87099a31614b66ae800fefab7120e9add5ab03815c430 +SHA512 (doctemplates-0.2.1.tar.gz) = f6040932fe616412c999dd2c0d186b29c457258dc58bd3c319a39033f606fa68e756eae2be3f29951abd72f2f4eeb37a4b38004c7a6b1ae2c5b2dfd098bc9110 From 9c306fdd57d08b80441ae7d4cacf3678002a537f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 27 Jan 2018 21:07:55 +0100 Subject: [PATCH 06/31] disable tests on s390x Test suite doctemplates-test: RUNNING... doctemplates-test: unknown RTS option: -N --- ghc-doctemplates.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 221b031..c8a966d 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -4,7 +4,11 @@ %global pkg_name doctemplates %global pkgver %{pkg_name}-%{version} +%ifnarch s390x %bcond_without tests +%else +%bcond_with tests +%endif Name: ghc-%{pkg_name} Version: 0.2.1 From 7eb342d1d395353a4ea67911b99cf776118f6adb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:02:24 +0900 Subject: [PATCH 07/31] drop ldconfig scriptlets --- ghc-doctemplates.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index c8a966d..3c48e93 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -76,12 +76,6 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 03d0cac68ad2246d7af2f34feea7cbd27a3a3f95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:34:51 +0000 Subject: [PATCH 08/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-doctemplates.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 3c48e93..8b8d55c 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Pandoc-style document templates License: BSD @@ -93,6 +93,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 0.2.1-1 - update to 0.2.1 From dfa79917c75f07e694df4355e76b5f4c9b5c94ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 01:44:38 +0000 Subject: [PATCH 09/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-doctemplates.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 8b8d55c..9d7bc51 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Pandoc-style document templates License: BSD @@ -93,6 +93,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 080a0aece239063cdbb39e78bce7283aa0edbc33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 23 Jul 2018 13:41:28 +0200 Subject: [PATCH 10/31] Rebuilt for #1607054 --- ghc-doctemplates.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 9d7bc51..a4ea92d 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Pandoc-style document templates License: BSD @@ -93,6 +93,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %changelog +* Mon Jul 23 2018 Miro Hrončok - 0.2.1-4 +- Rebuilt for #1607054 + * Fri Jul 13 2018 Fedora Release Engineering - 0.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From e68ef73d30e92d3721e993f92e1ca213fa9fe7a0 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 23 Jul 2018 17:51:30 -0700 Subject: [PATCH 11/31] Disable annotated build to work around #1607054 --- ghc-doctemplates.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index a4ea92d..10d35da 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -1,6 +1,9 @@ # generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell +# workaround https://bugzilla.redhat.com/show_bug.cgi?id=1607054 +%undefine _annotated_build + %global pkg_name doctemplates %global pkgver %{pkg_name}-%{version} From 9f6116efec3123c9b7d7cdb525e6a896d96c5d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 24 Jul 2018 18:53:12 +0200 Subject: [PATCH 12/31] Enable annotated build again This reverts commit e68ef73d30e92d3721e993f92e1ca213fa9fe7a0. --- ghc-doctemplates.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 10d35da..e249976 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -1,9 +1,6 @@ # generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell -# workaround https://bugzilla.redhat.com/show_bug.cgi?id=1607054 -%undefine _annotated_build - %global pkg_name doctemplates %global pkgver %{pkg_name}-%{version} @@ -15,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Pandoc-style document templates License: BSD @@ -96,6 +93,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %changelog +* Tue Jul 24 2018 Miro Hrončok - 0.2.1-5 +- Enable annotated build again + * Mon Jul 23 2018 Miro Hrončok - 0.2.1-4 - Rebuilt for #1607054 From db2df40b4167278e4f1fcedb2e1ff5f047af74fb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 28 Jul 2018 18:39:30 +0900 Subject: [PATCH 13/31] update to 0.2.2.1 --- .gitignore | 1 + ghc-doctemplates.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 89d9baf..c14fb77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /doctemplates-0.1.0.2.tar.gz /doctemplates-0.2.1.tar.gz +/doctemplates-0.2.2.1.tar.gz diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index e249976..23f4bd2 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name doctemplates @@ -11,8 +11,8 @@ %endif Name: ghc-%{pkg_name} -Version: 0.2.1 -Release: 5%{?dist} +Version: 0.2.2.1 +Release: 1%{?dist} Summary: Pandoc-style document templates License: BSD @@ -93,6 +93,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %changelog +* Sat Jul 28 2018 Jens Petersen - 0.2.2.1-1 +- update to 0.2.2.1 + * Tue Jul 24 2018 Miro Hrončok - 0.2.1-5 - Enable annotated build again diff --git a/sources b/sources index 0b6892c..1dbb2fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (doctemplates-0.2.1.tar.gz) = f6040932fe616412c999dd2c0d186b29c457258dc58bd3c319a39033f606fa68e756eae2be3f29951abd72f2f4eeb37a4b38004c7a6b1ae2c5b2dfd098bc9110 +SHA512 (doctemplates-0.2.2.1.tar.gz) = e1ad0d61dc97a69febf55ad76ee05e6696b76b0df5ee925072e934b977d1ca4c8d9ce0bc9acb311ec1992ce783e86fcaec93a93fc47fecffbd0071f002013485 From 7fc0f087f3ae6c274741c747d9164eb8c8cd8e1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:26:20 +0000 Subject: [PATCH 14/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-doctemplates.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 23f4bd2..e55c4a7 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Pandoc-style document templates License: BSD @@ -93,6 +93,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 28 2018 Jens Petersen - 0.2.2.1-1 - update to 0.2.2.1 From cbeb5ce34a3f597cca0a9019cf71b0767a3047d1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:44:26 +0800 Subject: [PATCH 15/31] refresh to cabal-rpm-0.13 --- ghc-doctemplates.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index e55c4a7..6bfa5e3 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name doctemplates @@ -12,16 +12,18 @@ Name: ghc-%{pkg_name} Version: 0.2.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Pandoc-style document templates 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-aeson-devel BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-blaze-markup-devel @@ -59,17 +61,23 @@ 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 rm %{buildroot}%{_datadir}/%{pkgver}/README.md +# End cabal-rpm install %check @@ -85,7 +93,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -93,6 +103,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %changelog +* Sun Feb 17 2019 Jens Petersen - 0.2.2.1-3 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 32eade1b3be399342f9c79158303cabf724dab94 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:22:48 +0000 Subject: [PATCH 16/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-doctemplates.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 6bfa5e3..1bcf6e2 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.2.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Pandoc-style document templates License: BSD @@ -103,6 +103,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.2.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 0.2.2.1-3 - refresh to cabal-rpm-0.13 From a82f4ba994e91e4acfdff40ce81f9e82f1872c02 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:22:52 +0000 Subject: [PATCH 17/31] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-doctemplates.spec | 53 ++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 1bcf6e2..7ac949f 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.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 doctemplates @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.2.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Pandoc-style document templates License: BSD @@ -23,6 +23,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-aeson-devel BuildRequires: ghc-blaze-html-devel @@ -48,11 +54,8 @@ to use independently. %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} @@ -60,6 +63,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} @@ -84,14 +106,6 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -102,7 +116,20 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %doc README.md +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog +* Thu Aug 01 2019 Jens Petersen - 0.2.2.1-5 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 0.2.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 7165cdb19315a07eb824512af4954c091582815a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:28:49 +0800 Subject: [PATCH 18/31] BR prof for lib and static for executable --- ghc-doctemplates.spec | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 7ac949f..4f263c0 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.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 doctemplates @@ -23,23 +23,18 @@ 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-aeson-devel -BuildRequires: ghc-blaze-html-devel -BuildRequires: ghc-blaze-markup-devel -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-parsec-devel -BuildRequires: ghc-scientific-devel -BuildRequires: ghc-text-devel -BuildRequires: ghc-unordered-containers-devel -BuildRequires: ghc-vector-devel +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-base-prof +BuildRequires: ghc-blaze-html-prof +BuildRequires: ghc-blaze-markup-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-parsec-prof +BuildRequires: ghc-scientific-prof +BuildRequires: ghc-text-prof +BuildRequires: ghc-unordered-containers-prof +BuildRequires: ghc-vector-prof %if %{with tests} BuildRequires: ghc-hspec-devel %endif @@ -54,6 +49,7 @@ to use independently. %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 19fe1a3a83cc032df190ec607c15b96d7f2b52a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:36:47 +0000 Subject: [PATCH 19/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-doctemplates.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 4f263c0..dc00a9a 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.2.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Pandoc-style document templates License: BSD @@ -123,6 +123,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.2.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Aug 01 2019 Jens Petersen - 0.2.2.1-5 - add doc and prof subpackages (cabal-rpm-1.0.0) From 85a98d4cc50112f61fcd88aa49f3efeca05da6bd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:49:57 +0800 Subject: [PATCH 20/31] refresh to cabal-rpm-2.0.2 --- ghc-doctemplates.spec | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index dc00a9a..2353627 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.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 doctemplates @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.2.2.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Pandoc-style document templates License: BSD @@ -62,6 +62,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. @@ -72,6 +73,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. @@ -102,6 +104,16 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %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 @@ -114,6 +126,7 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif @@ -123,6 +136,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %changelog +* Wed Feb 19 2020 Jens Petersen - 0.2.2.1-7 +- refresh to cabal-rpm-2.0.2 + * Tue Jan 28 2020 Fedora Release Engineering - 0.2.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 9c99eabdcac5abc32e668893456424d43e586285 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:26:07 +0800 Subject: [PATCH 21/31] refresh to cabal-rpm-2.0.5 --- ghc-doctemplates.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 2353627..0adddcc 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.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 doctemplates %global pkgver %{pkg_name}-%{version} From 1c5c01add8098ff4eb6a431568c774b7905bd41c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 8 Jun 2020 01:57:04 +0800 Subject: [PATCH 22/31] update to 0.8 with 4 additional deps --- .gitignore | 5 +++ ghc-doctemplates.spec | 84 ++++++++++++++++++++++++++++++------------- sources | 6 +++- 3 files changed, 69 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index c14fb77..0bfc6c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ /doctemplates-0.1.0.2.tar.gz /doctemplates-0.2.1.tar.gz /doctemplates-0.2.2.1.tar.gz +/doctemplates-0.8.tar.gz +/doclayout-0.2.0.1.tar.gz +/text-conversions-0.3.0.tar.gz +/HsYAML-0.2.1.0.tar.gz +/errors-2.3.0.tar.gz diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 0adddcc..ab6b040 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -1,49 +1,68 @@ -# generated by cabal-rpm-2.0.5 +# generated by cabal-rpm-2.0.5 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name doctemplates %global pkgver %{pkg_name}-%{version} -%ifnarch s390x -%bcond_without tests -%else -%bcond_with tests -%endif +%global HsYAML HsYAML-0.2.1.0 +%global doclayout doclayout-0.2.0.1 +%global errors errors-2.3.0 +%global textconversions text-conversions-0.3.0 +%global subpkgs %{HsYAML} %{doclayout} %{errors} %{textconversions} + +# testsuite missing deps: doclayout tasty-golden Name: ghc-%{pkg_name} -Version: 0.2.2.1 -Release: 7%{?dist} +Version: 0.8 +# can only be reset when all subpkgs bumped +Release: 1%{?dist} Summary: Pandoc-style document templates 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/%{HsYAML}/%{HsYAML}.tar.gz +Source2: https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.tar.gz +Source3: https://hackage.haskell.org/package/%{errors}/%{errors}.tar.gz +Source4: https://hackage.haskell.org/package/%{textconversions}/%{textconversions}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra +#BuildRequires: ghc-HsYAML-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-base-prof -BuildRequires: ghc-blaze-html-prof -BuildRequires: ghc-blaze-markup-prof -BuildRequires: ghc-bytestring-prof BuildRequires: ghc-containers-prof +#BuildRequires: ghc-doclayout-prof +BuildRequires: ghc-filepath-prof +BuildRequires: ghc-mtl-prof BuildRequires: ghc-parsec-prof +BuildRequires: ghc-safe-prof BuildRequires: ghc-scientific-prof BuildRequires: ghc-text-prof +#BuildRequires: ghc-text-conversions-prof BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-vector-prof -%if %{with tests} -BuildRequires: ghc-hspec-devel -%endif +# for missing dep 'HsYAML': +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-deepseq-prof +# for missing dep 'errors': +BuildRequires: ghc-exceptions-prof +BuildRequires: ghc-transformers-prof +BuildRequires: ghc-transformers-compat-prof +# for missing dep 'text-conversions': +BuildRequires: ghc-base16-bytestring-prof +BuildRequires: ghc-base64-bytestring-prof +BuildRequires: ghc-bytestring-prof # End cabal-rpm deps %description -This is the templating system used by pandoc. It was formerly -a module in pandoc. It has been split off to make it easier -to use independently. +This is the text templating system used by pandoc. It supports variable +interpolation, iteration, tests for non-blank values, pipes, and partials. +Templates are rendered to doclayout Docs, and variable values may come from a +variety of different sources, including aeson Values. %package devel @@ -80,30 +99,41 @@ This package provides the Haskell %{pkg_name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{HsYAML} +%ghc_lib_subpackage %{doclayout} +%ghc_lib_subpackage %{errors} +%ghc_lib_subpackage %{textconversions} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} +%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 # End cabal-rpm setup %build # Begin cabal-rpm build: +%ghc_libs_build %{subpkgs} %ghc_lib_build # End cabal-rpm build %install # Begin cabal-rpm install +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} -rm %{buildroot}%{_datadir}/%{pkgver}/README.md +rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md} # End cabal-rpm install -%check -%cabal_test - - %if 0%{?fedora} < 31 || 0%{?rhel} < 8 %post devel %ghc_pkg_recache @@ -121,7 +151,7 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %files devel -f %{name}-devel.files -%doc README.md +%doc README.md changelog.md %if %{with haddock} @@ -136,6 +166,10 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md %changelog +* Sun Jun 07 2020 Jens Petersen - 0.8-1 +- update to 0.8 +- subpackage HsYAML, doclayout, text-conversions, and errors + * Wed Feb 19 2020 Jens Petersen - 0.2.2.1-7 - refresh to cabal-rpm-2.0.2 diff --git a/sources b/sources index 1dbb2fb..27ba5d0 100644 --- a/sources +++ b/sources @@ -1 +1,5 @@ -SHA512 (doctemplates-0.2.2.1.tar.gz) = e1ad0d61dc97a69febf55ad76ee05e6696b76b0df5ee925072e934b977d1ca4c8d9ce0bc9acb311ec1992ce783e86fcaec93a93fc47fecffbd0071f002013485 +SHA512 (HsYAML-0.2.1.0.tar.gz) = f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304 +SHA512 (doclayout-0.2.0.1.tar.gz) = 1a5f847106762a6808c5dd1512a30a3d9cac0c0b4d5f0a9c35c5eb9c6326fe49117c0f317f5b7ff63363c3fbc2c3a9689194aa74e5f21b16045614909d439d9e +SHA512 (doctemplates-0.8.tar.gz) = 1e83c890c69980cf0ac814b0654427df548f98b47f483d766996b53f0035119ae284fdd33e7145607a199cf13a3a99a6572fb4ad7787217b6232bc96d763efcf +SHA512 (errors-2.3.0.tar.gz) = dddfc63505fd7023c4a669b3cc3d736cf7ecb774b53dcdfeee2d203dcdf4684f5d149a1c217134de214b64af4e154a3ef08b315615c85a1c734ceb42e80823b4 +SHA512 (text-conversions-0.3.0.tar.gz) = 767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec From 47973fe24cdfd1bad2bd400ada599e527f414cb2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:54:44 +0800 Subject: [PATCH 23/31] refresh to cabal-rpm-2.0.6 --- ghc-doctemplates.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index ab6b040..497d9cf 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 --subpackage +# generated by cabal-rpm-2.0.6 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name doctemplates @@ -134,16 +134,6 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md} # End cabal-rpm install -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE From 79c88cad8dfe835c7dc45f1531efbf933796915f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 23:55:24 +0800 Subject: [PATCH 24/31] update to 0.8.2 --- .gitignore | 2 ++ ghc-doctemplates.spec | 9 ++++++--- sources | 5 ++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0bfc6c6..1de164f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /text-conversions-0.3.0.tar.gz /HsYAML-0.2.1.0.tar.gz /errors-2.3.0.tar.gz +/doctemplates-0.8.2.tar.gz +/doclayout-0.3.tar.gz diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 497d9cf..4321809 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -5,7 +5,7 @@ %global pkgver %{pkg_name}-%{version} %global HsYAML HsYAML-0.2.1.0 -%global doclayout doclayout-0.2.0.1 +%global doclayout doclayout-0.3 %global errors errors-2.3.0 %global textconversions text-conversions-0.3.0 %global subpkgs %{HsYAML} %{doclayout} %{errors} %{textconversions} @@ -13,9 +13,9 @@ # testsuite missing deps: doclayout tasty-golden Name: ghc-%{pkg_name} -Version: 0.8 +Version: 0.8.2 # can only be reset when all subpkgs bumped -Release: 1%{?dist} +Release: 2%{?dist} Summary: Pandoc-style document templates License: BSD @@ -156,6 +156,9 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md} %changelog +* Fri Jun 19 2020 Jens Petersen - 0.8.2-2 +- update to 0.8.2 + * Sun Jun 07 2020 Jens Petersen - 0.8-1 - update to 0.8 - subpackage HsYAML, doclayout, text-conversions, and errors diff --git a/sources b/sources index 27ba5d0..4a43866 100644 --- a/sources +++ b/sources @@ -1,5 +1,4 @@ -SHA512 (HsYAML-0.2.1.0.tar.gz) = f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304 -SHA512 (doclayout-0.2.0.1.tar.gz) = 1a5f847106762a6808c5dd1512a30a3d9cac0c0b4d5f0a9c35c5eb9c6326fe49117c0f317f5b7ff63363c3fbc2c3a9689194aa74e5f21b16045614909d439d9e -SHA512 (doctemplates-0.8.tar.gz) = 1e83c890c69980cf0ac814b0654427df548f98b47f483d766996b53f0035119ae284fdd33e7145607a199cf13a3a99a6572fb4ad7787217b6232bc96d763efcf +SHA512 (doclayout-0.3.tar.gz) = ccb8c41977c5cea47294157c812a31b3be5bddc872915d8baf0d9063d597429606d83e4f7cf9e4aea9b1e1416cbcf732fbbcd71b6659de6510c661f9225d33d0 +SHA512 (doctemplates-0.8.2.tar.gz) = 1e1dbb8f8a2980b342ef3b5c2c0fefa8d0bf220d5ca1332de3dbdf30ab3243fd6f4d12816fa25851498a26c25c5fba1bc2aa6f16eafca11c65bc125a203b90ad SHA512 (errors-2.3.0.tar.gz) = dddfc63505fd7023c4a669b3cc3d736cf7ecb774b53dcdfeee2d203dcdf4684f5d149a1c217134de214b64af4e154a3ef08b315615c85a1c734ceb42e80823b4 SHA512 (text-conversions-0.3.0.tar.gz) = 767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec From 337e38d15369289ced8a02ed0726132c57639f46 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 18 Jul 2020 21:36:00 +0800 Subject: [PATCH 25/31] HsYAML was packaged --- .gitignore | 1 - ghc-doctemplates.spec | 21 ++++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 1de164f..25bdcbe 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ /doctemplates-0.8.tar.gz /doclayout-0.2.0.1.tar.gz /text-conversions-0.3.0.tar.gz -/HsYAML-0.2.1.0.tar.gz /errors-2.3.0.tar.gz /doctemplates-0.8.2.tar.gz /doclayout-0.3.tar.gz diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 4321809..0ec4b74 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -4,11 +4,10 @@ %global pkg_name doctemplates %global pkgver %{pkg_name}-%{version} -%global HsYAML HsYAML-0.2.1.0 %global doclayout doclayout-0.3 %global errors errors-2.3.0 %global textconversions text-conversions-0.3.0 -%global subpkgs %{HsYAML} %{doclayout} %{errors} %{textconversions} +%global subpkgs %{doclayout} %{errors} %{textconversions} # testsuite missing deps: doclayout tasty-golden @@ -22,16 +21,15 @@ 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/%{HsYAML}/%{HsYAML}.tar.gz -Source2: https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.tar.gz -Source3: https://hackage.haskell.org/package/%{errors}/%{errors}.tar.gz -Source4: https://hackage.haskell.org/package/%{textconversions}/%{textconversions}.tar.gz +Source1: https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.tar.gz +Source2: https://hackage.haskell.org/package/%{errors}/%{errors}.tar.gz +Source3: https://hackage.haskell.org/package/%{textconversions}/%{textconversions}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra -#BuildRequires: ghc-HsYAML-prof +BuildRequires: ghc-HsYAML-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-base-prof BuildRequires: ghc-containers-prof @@ -45,9 +43,6 @@ BuildRequires: ghc-text-prof #BuildRequires: ghc-text-conversions-prof BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-vector-prof -# for missing dep 'HsYAML': -BuildRequires: ghc-bytestring-prof -BuildRequires: ghc-deepseq-prof # for missing dep 'errors': BuildRequires: ghc-exceptions-prof BuildRequires: ghc-transformers-prof @@ -102,7 +97,6 @@ This package provides the Haskell %{pkg_name} profiling library. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{HsYAML} %ghc_lib_subpackage %{doclayout} %ghc_lib_subpackage %{errors} %ghc_lib_subpackage %{textconversions} @@ -113,7 +107,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 +%setup -q -n %{pkgver} -a1 -a2 -a3 # End cabal-rpm setup @@ -132,6 +126,7 @@ This package provides the Haskell %{pkg_name} profiling library. rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md} # End cabal-rpm install +rm %{buildroot}%{_datadir}/%{doclayout}/{README.md,changelog.md} %files -f %{name}.files @@ -161,7 +156,7 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md} * Sun Jun 07 2020 Jens Petersen - 0.8-1 - update to 0.8 -- subpackage HsYAML, doclayout, text-conversions, and errors +- subpackage doclayout, text-conversions, and errors * Wed Feb 19 2020 Jens Petersen - 0.2.2.1-7 - refresh to cabal-rpm-2.0.2 From d18bcd15ed40ab45bfb1a4eb2b0f56fc0e7f6db0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:03:40 +0000 Subject: [PATCH 26/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-doctemplates.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 0ec4b74..dd51dc1 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -14,7 +14,7 @@ Name: ghc-%{pkg_name} Version: 0.8.2 # can only be reset when all subpkgs bumped -Release: 2%{?dist} +Release: 3%{?dist} Summary: Pandoc-style document templates License: BSD @@ -151,6 +151,9 @@ rm %{buildroot}%{_datadir}/%{doclayout}/{README.md,changelog.md} %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jun 19 2020 Jens Petersen - 0.8.2-2 - update to 0.8.2 From a37ab6d03d53407c6192d2af7bf3f87c99454e56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:07:19 +0000 Subject: [PATCH 27/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-doctemplates.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index dd51dc1..a67d3f6 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -14,7 +14,7 @@ Name: ghc-%{pkg_name} Version: 0.8.2 # can only be reset when all subpkgs bumped -Release: 3%{?dist} +Release: 4%{?dist} Summary: Pandoc-style document templates License: BSD @@ -151,6 +151,9 @@ rm %{buildroot}%{_datadir}/%{doclayout}/{README.md,changelog.md} %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From c8f68737a32bea4473c233209574a8c6c58cbb8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:35:04 +0000 Subject: [PATCH 28/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-doctemplates.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index a67d3f6..bae5c3c 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -14,7 +14,7 @@ Name: ghc-%{pkg_name} Version: 0.8.2 # can only be reset when all subpkgs bumped -Release: 4%{?dist} +Release: 5%{?dist} Summary: Pandoc-style document templates License: BSD @@ -151,6 +151,9 @@ rm %{buildroot}%{_datadir}/%{doclayout}/{README.md,changelog.md} %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.8.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 4af08639d17676bf0f9f7152e74a9cf85ccbedad Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 10:45:19 +0800 Subject: [PATCH 29/31] update to 0.9 --- .gitignore | 3 +++ ghc-doctemplates.spec | 17 +++++++++++------ sources | 6 +++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 25bdcbe..df0b56c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ /errors-2.3.0.tar.gz /doctemplates-0.8.2.tar.gz /doclayout-0.3.tar.gz +/doctemplates-0.9.tar.gz +/text-conversions-0.3.1.tar.gz +/doclayout-0.3.0.2.tar.gz diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index bae5c3c..17b6d2a 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -1,20 +1,20 @@ -# generated by cabal-rpm-2.0.6 --subpackage +# generated by cabal-rpm-2.0.10 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name doctemplates %global pkgver %{pkg_name}-%{version} -%global doclayout doclayout-0.3 +%global doclayout doclayout-0.3.0.2 %global errors errors-2.3.0 -%global textconversions text-conversions-0.3.0 +%global textconversions text-conversions-0.3.1 %global subpkgs %{doclayout} %{errors} %{textconversions} # testsuite missing deps: doclayout tasty-golden Name: ghc-%{pkg_name} -Version: 0.8.2 +Version: 0.9 # can only be reset when all subpkgs bumped -Release: 5%{?dist} +Release: 6%{?dist} Summary: Pandoc-style document templates License: BSD @@ -77,6 +77,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. @@ -122,7 +123,6 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm install %ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_rpath %{pkgver} rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md} # End cabal-rpm install @@ -151,6 +151,11 @@ rm %{buildroot}%{_datadir}/%{doclayout}/{README.md,changelog.md} %changelog +* Thu Aug 5 2021 Jens Petersen - 0.9-6 +- update to 0.9 +- doclayout-0.3.0.2 +- text-conversions-0.3.1 + * Thu Jul 22 2021 Fedora Release Engineering - 0.8.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 4a43866..2e79dda 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (doclayout-0.3.tar.gz) = ccb8c41977c5cea47294157c812a31b3be5bddc872915d8baf0d9063d597429606d83e4f7cf9e4aea9b1e1416cbcf732fbbcd71b6659de6510c661f9225d33d0 -SHA512 (doctemplates-0.8.2.tar.gz) = 1e1dbb8f8a2980b342ef3b5c2c0fefa8d0bf220d5ca1332de3dbdf30ab3243fd6f4d12816fa25851498a26c25c5fba1bc2aa6f16eafca11c65bc125a203b90ad SHA512 (errors-2.3.0.tar.gz) = dddfc63505fd7023c4a669b3cc3d736cf7ecb774b53dcdfeee2d203dcdf4684f5d149a1c217134de214b64af4e154a3ef08b315615c85a1c734ceb42e80823b4 -SHA512 (text-conversions-0.3.0.tar.gz) = 767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec +SHA512 (doctemplates-0.9.tar.gz) = 3216fc7ef4e2a45230a2854c22c2a8622774bc834bbf59d34134912b3942df2a541230bd91324995e13e19098a0fa0bf7057c7d55ca35ec75da7840fddd61a37 +SHA512 (text-conversions-0.3.1.tar.gz) = 4c0fe08024a56e326b632a67b945fa869a798b00fa45b56f4f181a0075ed5cd6802edec0f0e38c0f4b5cc4b81c6f6bd98e3382b968cec6ad884d24ee31dbf600 +SHA512 (doclayout-0.3.0.2.tar.gz) = 5f777b66c5bb589021ce6f74e4cb4520a5078621cbcc62bc4eb8b73d54771f18523dfe40935f83553a5a4244219a86b6af22e7e3f33d251b3c567f91bb9596c0 From 264598ab7abdcc63f8a95e6087b4c5fd429f91c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:47:56 +0000 Subject: [PATCH 30/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-doctemplates.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 17b6d2a..cc19f18 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -14,7 +14,7 @@ Name: ghc-%{pkg_name} Version: 0.9 # can only be reset when all subpkgs bumped -Release: 6%{?dist} +Release: 7%{?dist} Summary: Pandoc-style document templates License: BSD @@ -151,6 +151,9 @@ rm %{buildroot}%{_datadir}/%{doclayout}/{README.md,changelog.md} %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 0.9-6 - update to 0.9 - doclayout-0.3.0.2 From 6472aca3288c32c55c6b59a341e6fe58a8a08c4d Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:39:53 +0300 Subject: [PATCH 31/31] Remove unnecessary files --- sources | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 2e79dda..0000000 --- a/sources +++ /dev/null @@ -1,4 +0,0 @@ -SHA512 (errors-2.3.0.tar.gz) = dddfc63505fd7023c4a669b3cc3d736cf7ecb774b53dcdfeee2d203dcdf4684f5d149a1c217134de214b64af4e154a3ef08b315615c85a1c734ceb42e80823b4 -SHA512 (doctemplates-0.9.tar.gz) = 3216fc7ef4e2a45230a2854c22c2a8622774bc834bbf59d34134912b3942df2a541230bd91324995e13e19098a0fa0bf7057c7d55ca35ec75da7840fddd61a37 -SHA512 (text-conversions-0.3.1.tar.gz) = 4c0fe08024a56e326b632a67b945fa869a798b00fa45b56f4f181a0075ed5cd6802edec0f0e38c0f4b5cc4b81c6f6bd98e3382b968cec6ad884d24ee31dbf600 -SHA512 (doclayout-0.3.0.2.tar.gz) = 5f777b66c5bb589021ce6f74e4cb4520a5078621cbcc62bc4eb8b73d54771f18523dfe40935f83553a5a4244219a86b6af22e7e3f33d251b3c567f91bb9596c0