From 6d41860f89ec0a7149fbd99b5caf557c432df778 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 10 May 2011 15:54:32 +0000 Subject: [PATCH 01/71] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From f7784f4a6ece98c6a458fb2fe375d1604ad62499 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 11 May 2011 17:35:41 +0900 Subject: [PATCH 02/71] initial import (#701343) --- .gitignore | 1 + ghc-pandoc-types.spec | 64 +++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 66 insertions(+) create mode 100644 ghc-pandoc-types.spec diff --git a/.gitignore b/.gitignore index e69de29..db88cc6 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/pandoc-types-1.8.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec new file mode 100644 index 0000000..28bbd08 --- /dev/null +++ b/ghc-pandoc-types.spec @@ -0,0 +1,64 @@ +# For Haskell Packaging Guidelines see: +# - https://fedoraproject.org/wiki/Packaging:Haskell +# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell + +%global pkg_name pandoc-types + +# common part of summary for all the subpackages +%global common_summary Pandoc data structure library + +# main description used for all the subpackages +%global common_description This package contains definitions for the Pandoc data structure, which\ +is used by pandoc to represent structured documents. These definitions\ +used to live in the pandoc package, but they have been split off, so\ +that other packages can use them without drawing in all of pandoc's\ +dependencies, and pandoc itself can depend on packages (like\ +citeproc-hs) that use them. + +# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) +%global ghc_pkg_deps ghc-syb-devel + +Name: ghc-%{pkg_name} +Version: 1.8 +Release: 1%{?dist} +Summary: %{common_summary} + +Group: System Environment/Libraries +License: GPLv2+ +URL: http://hackage.haskell.org/package/%{pkg_name} +Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +# fedora ghc archs: +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 +BuildRequires: ghc, ghc-doc, ghc-prof +# macros for building haskell packages +BuildRequires: ghc-rpm-macros +BuildRequires: hscolour +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} + +%description +%{common_description} + + +%prep +%setup -q -n %{pkg_name}-%{version} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + + +# define the devel and prof subpkgs, devel post[un] scripts, and filelists: +# ghc-%pkg_name{,devel,prof}.files +%ghc_lib_package + + +%changelog +* Tue May 3 2011 Jens Petersen - 1.8-1 +- + +* Tue May 3 2011 Fedora Haskell SIG - 1.8-0 +- initial packaging for Fedora automatically generated by cabal2spec-0.22.6 diff --git a/sources b/sources index e69de29..8dffa53 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +776a016eb01cfe62ad2849fe1b9f82bc pandoc-types-1.8.tar.gz From bb04c9925de304d752c43b9ec75dbf5aa8bd6c13 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 11 May 2011 17:43:59 +0900 Subject: [PATCH 03/71] drop ghc_pkg_deps and BR ghc-Cabal-devel and ghc-*-prof --- ghc-pandoc-types.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 28bbd08..0fc94a4 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -15,12 +15,9 @@ that other packages can use them without drawing in all of pandoc's\ dependencies, and pandoc itself can depend on packages (like\ citeproc-hs) that use them. -# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) -%global ghc_pkg_deps ghc-syb-devel - Name: ghc-%{pkg_name} Version: 1.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -29,11 +26,11 @@ URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 -BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-Cabal-devel # macros for building haskell packages BuildRequires: ghc-rpm-macros BuildRequires: hscolour -%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} +BuildRequires: ghc-containers-prof, ghc-syb-prof %description %{common_description} @@ -57,8 +54,12 @@ BuildRequires: hscolour %changelog +* Wed May 11 2011 Jens Petersen - 1.8-2 +- drop ghc_package_deps +- add BR on ghc-Cabal-devel and ghc-containers-prof + * Tue May 3 2011 Jens Petersen - 1.8-1 -- +- GPLv2+ and depends on syb * Tue May 3 2011 Fedora Haskell SIG - 1.8-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.6 From 101f5cd399fc9d211a726eed71eebfce67fee433 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 13 May 2011 17:36:00 +0900 Subject: [PATCH 04/71] update to 1.8.0.2 --- .gitignore | 1 + ghc-pandoc-types.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index db88cc6..63f75cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pandoc-types-1.8.tar.gz +/pandoc-types-1.8.0.2.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 0fc94a4..6d97859 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -16,8 +16,8 @@ dependencies, and pandoc itself can depend on packages (like\ citeproc-hs) that use them. Name: ghc-%{pkg_name} -Version: 1.8 -Release: 2%{?dist} +Version: 1.8.0.2 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -54,6 +54,9 @@ BuildRequires: ghc-containers-prof, ghc-syb-prof %changelog +* Fri May 13 2011 Jens Petersen - 1.8.0.2-1 +- update to 1.8.0.2 + * Wed May 11 2011 Jens Petersen - 1.8-2 - drop ghc_package_deps - add BR on ghc-Cabal-devel and ghc-containers-prof diff --git a/sources b/sources index 8dffa53..6b75a1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -776a016eb01cfe62ad2849fe1b9f82bc pandoc-types-1.8.tar.gz +a83e8aebe822417c3ff194a6eb1315f2 pandoc-types-1.8.0.2.tar.gz From 5c3960f59f35e094131b7ce1fa2ffc29f4dee8eb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Jun 2011 18:12:19 +0900 Subject: [PATCH 05/71] use ghc_arches (cabal2spec-0.23.2) --- ghc-pandoc-types.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 6d97859..d769a4e 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -17,15 +17,14 @@ citeproc-hs) that use them. Name: ghc-%{pkg_name} Version: 1.8.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: GPLv2+ URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 +ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel # macros for building haskell packages BuildRequires: ghc-rpm-macros @@ -54,6 +53,9 @@ BuildRequires: ghc-containers-prof, ghc-syb-prof %changelog +* Wed Jun 22 2011 Jens Petersen - 1.8.0.2-2 +- use ghc_arches (cabal2spec-0.23.2) + * Fri May 13 2011 Jens Petersen - 1.8.0.2-1 - update to 1.8.0.2 From 6c3a6710e9c43ab380d5419b0ac7ce4a8dc08eb0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Aug 2011 14:09:10 +0900 Subject: [PATCH 06/71] update to 1.8.2 --- .gitignore | 1 + ghc-pandoc-types.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 63f75cf..d338423 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /pandoc-types-1.8.tar.gz /pandoc-types-1.8.0.2.tar.gz +/pandoc-types-1.8.2.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index d769a4e..e009226 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -16,8 +16,8 @@ dependencies, and pandoc itself can depend on packages (like\ citeproc-hs) that use them. Name: ghc-%{pkg_name} -Version: 1.8.0.2 -Release: 2%{?dist} +Version: 1.8.2 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -48,11 +48,14 @@ BuildRequires: ghc-containers-prof, ghc-syb-prof # define the devel and prof subpkgs, devel post[un] scripts, and filelists: -# ghc-%pkg_name{,devel,prof}.files +# ghc-pandoc-types{,devel,prof}.files %ghc_lib_package %changelog +* Thu Aug 4 2011 Jens Petersen - 1.8.2-1 +- update to 1.8.2 + * Wed Jun 22 2011 Jens Petersen - 1.8.0.2-2 - use ghc_arches (cabal2spec-0.23.2) diff --git a/sources b/sources index 6b75a1e..a8d4fb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a83e8aebe822417c3ff194a6eb1315f2 pandoc-types-1.8.0.2.tar.gz +9ebdff6d337cb0bbe6da04b14dd1bf59 pandoc-types-1.8.2.tar.gz From fe08fbf746c6a3d51915d839dda951d80b81dfda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 11 Oct 2011 17:42:45 +0200 Subject: [PATCH 07/71] rebuild with new gmp --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index e009226..1084785 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -17,7 +17,7 @@ citeproc-hs) that use them. Name: ghc-%{pkg_name} Version: 1.8.2 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: %{common_summary} Group: System Environment/Libraries @@ -53,6 +53,9 @@ BuildRequires: ghc-containers-prof, ghc-syb-prof %changelog +* Tue Oct 11 2011 Peter Schiffer - 1.8.2-1.1 +- rebuild with new gmp + * Thu Aug 4 2011 Jens Petersen - 1.8.2-1 - update to 1.8.2 From af49faa95f7cc3813c1a38e381dca916f35f323d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 21 Oct 2011 02:48:02 +0200 Subject: [PATCH 08/71] rebuild with new gmp without compat lib --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 1084785..05e6086 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -17,7 +17,7 @@ citeproc-hs) that use them. Name: ghc-%{pkg_name} Version: 1.8.2 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 Summary: %{common_summary} Group: System Environment/Libraries @@ -53,6 +53,9 @@ BuildRequires: ghc-containers-prof, ghc-syb-prof %changelog +* Fri Oct 21 2011 Marcela Mašláňová - 1.8.2-1.2 +- rebuild with new gmp without compat lib + * Tue Oct 11 2011 Peter Schiffer - 1.8.2-1.1 - rebuild with new gmp From 17004bd1f86cb47d3c7184e5d07d04b9df19d2ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Mon, 24 Oct 2011 12:06:20 +0200 Subject: [PATCH 09/71] rebuild with new gmp without compat lib --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 05e6086..0ed6e6c 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -17,7 +17,7 @@ citeproc-hs) that use them. Name: ghc-%{pkg_name} Version: 1.8.2 -Release: 1%{?dist}.2 +Release: 1%{?dist}.3 Summary: %{common_summary} Group: System Environment/Libraries @@ -53,6 +53,9 @@ BuildRequires: ghc-containers-prof, ghc-syb-prof %changelog +* Mon Oct 24 2011 Marcela Mašláňová - 1.8.2-1.3 +- rebuild with new gmp without compat lib + * Fri Oct 21 2011 Marcela Mašláňová - 1.8.2-1.2 - rebuild with new gmp without compat lib From 3b93f72c84c6b3dd7cd7128f1b785e213e12aa41 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Jan 2012 14:22:55 +0900 Subject: [PATCH 10/71] update to cabal2spec-0.25.2 --- ghc-pandoc-types.spec | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 0ed6e6c..eb2533e 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -1,13 +1,11 @@ -# For Haskell Packaging Guidelines see: -# - https://fedoraproject.org/wiki/Packaging:Haskell -# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell +# cabal2spec-0.25.2 +# https://fedoraproject.org/wiki/Packaging:Haskell +# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name pandoc-types -# common part of summary for all the subpackages %global common_summary Pandoc data structure library -# main description used for all the subpackages %global common_description This package contains definitions for the Pandoc data structure, which\ is used by pandoc to represent structured documents. These definitions\ used to live in the pandoc package, but they have been split off, so\ @@ -17,19 +15,20 @@ citeproc-hs) that use them. Name: ghc-%{pkg_name} Version: 1.8.2 -Release: 1%{?dist}.3 +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: GPLv2+ +# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel -# macros for building haskell packages -BuildRequires: ghc-rpm-macros -BuildRequires: hscolour -BuildRequires: ghc-containers-prof, ghc-syb-prof +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} +# END cabal2spec +BuildRequires: ghc-containers-prof +BuildRequires: ghc-syb-prof %description %{common_description} @@ -47,12 +46,21 @@ BuildRequires: ghc-containers-prof, ghc-syb-prof %ghc_lib_install -# define the devel and prof subpkgs, devel post[un] scripts, and filelists: -# ghc-pandoc-types{,devel,prof}.files -%ghc_lib_package +%ghc_devel_package + +%ghc_devel_description + + +%ghc_devel_post_postun + + +%ghc_files %changelog +* Thu Jan 5 2012 Jens Petersen - 1.8.2-2 +- update to cabal2spec-0.25.2 + * Mon Oct 24 2011 Marcela Mašláňová - 1.8.2-1.3 - rebuild with new gmp without compat lib From 01db005da6e7c707b7fc1feb8280cd971840f3ac Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 12 Feb 2012 18:00:34 +0900 Subject: [PATCH 11/71] update to 1.9.0.2 --- .gitignore | 1 + ghc-pandoc-types.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d338423..9af93f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /pandoc-types-1.8.tar.gz /pandoc-types-1.8.0.2.tar.gz /pandoc-types-1.8.2.tar.gz +/pandoc-types-1.9.0.2.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index eb2533e..3d9f9fe 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -14,8 +14,8 @@ dependencies, and pandoc itself can depend on packages (like\ citeproc-hs) that use them. Name: ghc-%{pkg_name} -Version: 1.8.2 -Release: 2%{?dist} +Version: 1.9.0.2 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -58,6 +58,9 @@ BuildRequires: ghc-syb-prof %changelog +* Sun Feb 12 2012 Jens Petersen - 1.9.0.2-1 +- update to 1.9.0.2 + * Thu Jan 5 2012 Jens Petersen - 1.8.2-2 - update to cabal2spec-0.25.2 diff --git a/sources b/sources index a8d4fb0..8cc1269 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9ebdff6d337cb0bbe6da04b14dd1bf59 pandoc-types-1.8.2.tar.gz +9ec7d1901be9a13724377f3775e7d3ed pandoc-types-1.9.0.2.tar.gz From c4492ee5d584e847426b1e55db7cbcda8a2f8a5c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 7 Mar 2012 16:52:51 +0900 Subject: [PATCH 12/71] update to 1.9.1 --- .gitignore | 1 + ghc-pandoc-types.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9af93f8..b85cbe1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pandoc-types-1.8.0.2.tar.gz /pandoc-types-1.8.2.tar.gz /pandoc-types-1.9.0.2.tar.gz +/pandoc-types-1.9.1.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 3d9f9fe..038a987 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -14,7 +14,7 @@ dependencies, and pandoc itself can depend on packages (like\ citeproc-hs) that use them. Name: ghc-%{pkg_name} -Version: 1.9.0.2 +Version: 1.9.1 Release: 1%{?dist} Summary: %{common_summary} @@ -58,6 +58,9 @@ BuildRequires: ghc-syb-prof %changelog +* Wed Mar 7 2012 Jens Petersen - 1.9.1-1 +- update to 1.9.1 + * Sun Feb 12 2012 Jens Petersen - 1.9.0.2-1 - update to 1.9.0.2 diff --git a/sources b/sources index 8cc1269..c781303 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9ec7d1901be9a13724377f3775e7d3ed pandoc-types-1.9.0.2.tar.gz +cd62b1a10aad85237c22999c40efe35c pandoc-types-1.9.1.tar.gz From f7619e8c4733af36517ab42f45c1b366c4b7c85f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 23 Mar 2012 00:05:50 +0900 Subject: [PATCH 13/71] add license to ghc_files --- ghc-pandoc-types.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 038a987..0bb0a4a 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -15,7 +15,7 @@ citeproc-hs) that use them. Name: ghc-%{pkg_name} Version: 1.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -54,10 +54,13 @@ BuildRequires: ghc-syb-prof %ghc_devel_post_postun -%ghc_files +%ghc_files COPYING %changelog +* Thu Mar 22 2012 Jens Petersen - 1.9.1-2 +- add license to ghc_files + * Wed Mar 7 2012 Jens Petersen - 1.9.1-1 - update to 1.9.1 From 50215d5c169ca04728322d8650963bbe47b6938c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 15 Jun 2012 17:50:44 +0900 Subject: [PATCH 14/71] rebuild --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 0bb0a4a..842abb6 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -15,7 +15,7 @@ citeproc-hs) that use them. Name: ghc-%{pkg_name} Version: 1.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -58,6 +58,9 @@ BuildRequires: ghc-syb-prof %changelog +* Fri Jun 15 2012 Jens Petersen - 1.9.1-3 +- rebuild + * Thu Mar 22 2012 Jens Petersen - 1.9.1-2 - add license to ghc_files From 57f7e51edefa1c97addb2a0a9777c0dec04a653f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Jul 2012 11:13:39 +0900 Subject: [PATCH 15/71] change prof BRs to devel --- ghc-pandoc-types.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 842abb6..73a8bb7 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -15,7 +15,7 @@ citeproc-hs) that use them. Name: ghc-%{pkg_name} Version: 1.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -27,8 +27,8 @@ ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec -BuildRequires: ghc-containers-prof -BuildRequires: ghc-syb-prof +BuildRequires: ghc-containers-devel +BuildRequires: ghc-syb-devel %description %{common_description} @@ -58,6 +58,9 @@ BuildRequires: ghc-syb-prof %changelog +* Mon Jul 16 2012 Jens Petersen - 1.9.1-4 +- change prof BRs to devel + * Fri Jun 15 2012 Jens Petersen - 1.9.1-3 - rebuild From 31898caa764bee8031494a7436c2d9c76affc909 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 00:52:32 -0500 Subject: [PATCH 16/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 73a8bb7..3eeab29 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -15,7 +15,7 @@ citeproc-hs) that use them. Name: ghc-%{pkg_name} Version: 1.9.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -58,6 +58,9 @@ BuildRequires: ghc-syb-devel %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1.9.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Jul 16 2012 Jens Petersen - 1.9.1-4 - change prof BRs to devel From afc5f78a776e2c8ef83ab6c5a90299b801ce1edc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 18 Nov 2012 00:36:35 +0900 Subject: [PATCH 17/71] update with cabal-rpm --- ghc-pandoc-types.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 3eeab29..e262113 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -1,10 +1,9 @@ -# cabal2spec-0.25.2 # https://fedoraproject.org/wiki/Packaging:Haskell # https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name pandoc-types -%global common_summary Pandoc data structure library +%global common_summary Types for representing a structured document %global common_description This package contains definitions for the Pandoc data structure, which\ is used by pandoc to represent structured documents. These definitions\ @@ -15,20 +14,19 @@ citeproc-hs) that use them. Name: ghc-%{pkg_name} Version: 1.9.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_summary} -Group: System Environment/Libraries License: GPLv2+ -# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -ExclusiveArch: %{ghc_arches} + BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: BuildRequires: ghc-containers-devel BuildRequires: ghc-syb-devel +# End cabal-rpm deps %description %{common_description} @@ -58,6 +56,9 @@ BuildRequires: ghc-syb-devel %changelog +* Sat Nov 17 2012 Jens Petersen - 1.9.1-6 +- update with cabal-rpm + * Thu Jul 19 2012 Fedora Release Engineering - 1.9.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From d5a8e5958044164687714d681a9940ba27c057c0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 17:14:55 -0600 Subject: [PATCH 18/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index e262113..a54dd24 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -14,7 +14,7 @@ citeproc-hs) that use them. Name: ghc-%{pkg_name} Version: 1.9.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{common_summary} License: GPLv2+ @@ -56,6 +56,9 @@ BuildRequires: ghc-syb-devel %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1.9.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Nov 17 2012 Jens Petersen - 1.9.1-6 - update with cabal-rpm From e4744416940c43828ccdf06958bed49d66413e6b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 10 Mar 2013 18:42:14 +0900 Subject: [PATCH 19/71] update to 1.10 --- .gitignore | 1 + ghc-pandoc-types.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b85cbe1..512e87f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /pandoc-types-1.8.2.tar.gz /pandoc-types-1.9.0.2.tar.gz /pandoc-types-1.9.1.tar.gz +/pandoc-types-1.10.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index a54dd24..6146fad 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -13,8 +13,8 @@ dependencies, and pandoc itself can depend on packages (like\ citeproc-hs) that use them. Name: ghc-%{pkg_name} -Version: 1.9.1 -Release: 7%{?dist} +Version: 1.10 +Release: 1%{?dist} Summary: %{common_summary} License: GPLv2+ @@ -56,6 +56,9 @@ BuildRequires: ghc-syb-devel %changelog +* Sun Mar 10 2013 Jens Petersen - 1.10-1 +- update to 1.10 + * Wed Feb 13 2013 Fedora Release Engineering - 1.9.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index c781303..e5f4209 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd62b1a10aad85237c22999c40efe35c pandoc-types-1.9.1.tar.gz +8534ce863f33550120892f981ad2d9a2 pandoc-types-1.10.tar.gz From f4dee724ce7b144387b753e55dc697a1ebfa7bff Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 5 Jun 2013 17:17:25 +0900 Subject: [PATCH 20/71] update to new simplified Haskell Packaging Guidelines --- ghc-pandoc-types.spec | 47 +++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 6146fad..2b2afe5 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -1,21 +1,11 @@ # https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name pandoc-types -%global common_summary Types for representing a structured document - -%global common_description This package contains definitions for the Pandoc data structure, which\ -is used by pandoc to represent structured documents. These definitions\ -used to live in the pandoc package, but they have been split off, so\ -that other packages can use them without drawing in all of pandoc's\ -dependencies, and pandoc itself can depend on packages (like\ -citeproc-hs) that use them. - Name: ghc-%{pkg_name} Version: 1.10 -Release: 1%{?dist} -Summary: %{common_summary} +Release: 2%{?dist} +Summary: Types for representing a structured document License: GPLv2+ URL: http://hackage.haskell.org/package/%{pkg_name} @@ -29,7 +19,23 @@ BuildRequires: ghc-syb-devel # End cabal-rpm deps %description -%{common_description} +This package contains definitions for the Pandoc data structure, which +is used by pandoc to represent structured documents. These definitions +used to live in the pandoc package, but they have been split off, so +that other packages can use them without drawing in all of pandoc's +dependencies, and pandoc itself can depend on packages (like +citeproc-hs) that use them. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. %prep @@ -44,18 +50,25 @@ BuildRequires: ghc-syb-devel %ghc_lib_install -%ghc_devel_package +%post devel +%ghc_pkg_recache -%ghc_devel_description +%postun devel +%ghc_pkg_recache -%ghc_devel_post_postun +%files -f %{name}.files +%doc COPYING -%ghc_files COPYING + +%files devel -f %{name}-devel.files %changelog +* Wed Jun 05 2013 Jens Petersen - 1.10-2 +- update to new simplified Haskell Packaging Guidelines + * Sun Mar 10 2013 Jens Petersen - 1.10-1 - update to 1.10 From 14550cb829f03dbff1f0492d6682f9c1255a37db Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 08:54:22 -0500 Subject: [PATCH 21/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 2b2afe5..a72fa08 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 1.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -66,6 +66,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jun 05 2013 Jens Petersen - 1.10-2 - update to new simplified Haskell Packaging Guidelines From f81e713c557b0b0708392d87a06c4bd58a21342d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Jan 2014 18:37:09 +0900 Subject: [PATCH 22/71] update to 1.12.3.1 --- .gitignore | 1 + ghc-pandoc-types.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 512e87f..c50d04f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /pandoc-types-1.9.0.2.tar.gz /pandoc-types-1.9.1.tar.gz /pandoc-types-1.10.tar.gz +/pandoc-types-1.12.3.1.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index a72fa08..41eefa5 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -3,8 +3,8 @@ %global pkg_name pandoc-types Name: ghc-%{pkg_name} -Version: 1.10 -Release: 3%{?dist} +Version: 1.12.3.1 +Release: 1%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -14,6 +14,8 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{versio BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-syb-devel # End cabal-rpm deps @@ -66,6 +68,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jan 22 2014 Jens Petersen - 1.12.3.1-1 +- update to 1.12.3.1 + * Sat Aug 03 2013 Fedora Release Engineering - 1.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index e5f4209..5073f59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8534ce863f33550120892f981ad2d9a2 pandoc-types-1.10.tar.gz +b325fed6ee8b7b72f71285b36c76c3d5 pandoc-types-1.12.3.1.tar.gz From 929859ffe9beea03f5f1fbee71c39811810b639a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 20 Apr 2014 11:56:57 +0900 Subject: [PATCH 23/71] aeson needs TemplateHaskell; update with latest cblrpm --- ghc-pandoc-types.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 41eefa5..e2505dd 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -4,12 +4,12 @@ Name: ghc-%{pkg_name} Version: 1.12.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Types for representing a structured document License: GPLv2+ URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -18,6 +18,7 @@ BuildRequires: ghc-aeson-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-syb-devel +ExclusiveArch: %{ghc_arches_with_ghci} # End cabal-rpm deps %description @@ -31,10 +32,11 @@ citeproc-hs) that use them. %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} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package provides the Haskell %{pkg_name} library development files. @@ -68,6 +70,10 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Apr 20 2014 Jens Petersen - 1.12.3.1-2 +- aeson needs TemplateHaskell +- update packaging to latest cblrpm + * Wed Jan 22 2014 Jens Petersen - 1.12.3.1-1 - update to 1.12.3.1 From 12abca8b08c0e2267fe3cc7450d396d2d4432b18 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 20 Apr 2014 11:59:26 +0900 Subject: [PATCH 24/71] add comment for ExclusiveArch --- ghc-pandoc-types.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index e2505dd..31ba21e 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -18,6 +18,7 @@ BuildRequires: ghc-aeson-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-syb-devel +# aeson needs TemplateHaskell ExclusiveArch: %{ghc_arches_with_ghci} # End cabal-rpm deps From 7cd43099b690e74b88f9ea0fc7eb0f2354440ae1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 20 Apr 2014 15:49:51 +0900 Subject: [PATCH 25/71] revert requiring ghci: aeson now patched to build when no ghci --- ghc-pandoc-types.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 31ba21e..e8fdb87 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 1.12.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -18,8 +18,6 @@ BuildRequires: ghc-aeson-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-syb-devel -# aeson needs TemplateHaskell -ExclusiveArch: %{ghc_arches_with_ghci} # End cabal-rpm deps %description @@ -71,6 +69,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Apr 20 2014 Jens Petersen - 1.12.3.1-3 +- revert requiring ghci: aeson now patched to build when no ghci + * Sun Apr 20 2014 Jens Petersen - 1.12.3.1-2 - aeson needs TemplateHaskell - update packaging to latest cblrpm From dc759dfe49c0c8849d60b849631483d022af15d5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 May 2014 12:19:30 +0900 Subject: [PATCH 26/71] update to 1.12.3.3 --- .gitignore | 1 + ghc-pandoc-types.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c50d04f..e0ffd9b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /pandoc-types-1.9.1.tar.gz /pandoc-types-1.10.tar.gz /pandoc-types-1.12.3.1.tar.gz +/pandoc-types-1.12.3.3.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index e8fdb87..f39e859 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -3,8 +3,8 @@ %global pkg_name pandoc-types Name: ghc-%{pkg_name} -Version: 1.12.3.1 -Release: 3%{?dist} +Version: 1.12.3.3 +Release: 1%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -69,6 +69,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu May 08 2014 Jens Petersen - 1.12.3.3-1 +- update to 1.12.3.3 + * Sun Apr 20 2014 Jens Petersen - 1.12.3.1-3 - revert requiring ghci: aeson now patched to build when no ghci diff --git a/sources b/sources index 5073f59..3bc447c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b325fed6ee8b7b72f71285b36c76c3d5 pandoc-types-1.12.3.1.tar.gz +5a5076fdf259de1d28c7a951bd6402a6 pandoc-types-1.12.3.3.tar.gz From 0c3c4929be82064153b9e821f3b5e3c817245e8d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 10:04:30 -0500 Subject: [PATCH 27/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index f39e859..e71b094 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 1.12.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -69,6 +69,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.12.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu May 08 2014 Jens Petersen - 1.12.3.3-1 - update to 1.12.3.3 From 5b94d3b2847f599e1ff3ed25f504759b5553e739 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 15:32:38 +0000 Subject: [PATCH 28/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index e71b094..56219ed 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 1.12.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -69,6 +69,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 1.12.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.12.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From c57e840af68ccffe7c7172ca3aee41a37336bc8c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 26 Jan 2015 11:58:39 +0900 Subject: [PATCH 29/71] update to 1.12.4.1 --- .gitignore | 1 + ghc-pandoc-types.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e0ffd9b..c02735a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /pandoc-types-1.10.tar.gz /pandoc-types-1.12.3.1.tar.gz /pandoc-types-1.12.3.3.tar.gz +/pandoc-types-1.12.4.1.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 56219ed..1cb5177 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -3,13 +3,13 @@ %global pkg_name pandoc-types Name: ghc-%{pkg_name} -Version: 1.12.3.3 -Release: 3%{?dist} +Version: 1.12.4.1 +Release: 1%{?dist} Summary: Types for representing a structured document License: GPLv2+ -URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +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 @@ -17,6 +17,7 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-aeson-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-deepseq-generics-devel BuildRequires: ghc-syb-devel # End cabal-rpm deps @@ -69,6 +70,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Jan 26 2015 Jens Petersen - 1.12.4.1-1 +- update to 1.12.4.1 + * Sat Aug 16 2014 Fedora Release Engineering - 1.12.3.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 3bc447c..3b4bf84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a5076fdf259de1d28c7a951bd6402a6 pandoc-types-1.12.3.3.tar.gz +62cea7ac92a53a4023b9e849cf99792b pandoc-types-1.12.4.1.tar.gz From 97e40d3b1674e8382e3d8495e6196ccae4d0ce1d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 07:52:55 +0000 Subject: [PATCH 30/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 1cb5177..3efc540 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 1.12.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -70,6 +70,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.12.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Jan 26 2015 Jens Petersen - 1.12.4.1-1 - update to 1.12.4.1 From 0897a71d11016ce7a33dcb69c9682982b896e4d5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 31 Aug 2015 23:06:03 +0100 Subject: [PATCH 31/71] Rebuild (aarch64 vector hashes) --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 3efc540..37f014c 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 1.12.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -70,6 +70,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Aug 31 2015 Peter Robinson 1.12.4.1-3 +- Rebuild (aarch64 vector hashes) + * Wed Jun 17 2015 Fedora Release Engineering - 1.12.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From e449093152bb9e24c2e1ac0928d666de06111b6b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Sep 2015 19:01:07 +0900 Subject: [PATCH 32/71] update to 1.12.4.5 --- .gitignore | 1 + ghc-pandoc-types.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c02735a..7132a66 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /pandoc-types-1.12.3.1.tar.gz /pandoc-types-1.12.3.3.tar.gz /pandoc-types-1.12.4.1.tar.gz +/pandoc-types-1.12.4.5.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 37f014c..97c1d07 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -3,8 +3,8 @@ %global pkg_name pandoc-types Name: ghc-%{pkg_name} -Version: 1.12.4.1 -Release: 3%{?dist} +Version: 1.12.4.5 +Release: 1%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -53,6 +53,8 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %post devel %ghc_pkg_recache @@ -63,13 +65,16 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files -%doc COPYING +%license LICENSE %files devel -f %{name}-devel.files %changelog +* Thu Sep 17 2015 Jens Petersen - 1.12.4.5-1 +- update to 1.12.4.5 + * Mon Aug 31 2015 Peter Robinson 1.12.4.1-3 - Rebuild (aarch64 vector hashes) diff --git a/sources b/sources index 3b4bf84..7667a9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62cea7ac92a53a4023b9e849cf99792b pandoc-types-1.12.4.1.tar.gz +b73b9d1828208f9d985481c813aee1e5 pandoc-types-1.12.4.5.tar.gz From 46f3d8542233d1d5bbd105c8b5d18825f225193e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 2 Feb 2016 00:18:28 +0900 Subject: [PATCH 33/71] Reverting "update to 1.12.4.5" This reverts commit e449093152bb9e24c2e1ac0928d666de06111b6b. --- .gitignore | 1 - ghc-pandoc-types.spec | 11 +++-------- sources | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 7132a66..c02735a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ /pandoc-types-1.12.3.1.tar.gz /pandoc-types-1.12.3.3.tar.gz /pandoc-types-1.12.4.1.tar.gz -/pandoc-types-1.12.4.5.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 97c1d07..37f014c 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -3,8 +3,8 @@ %global pkg_name pandoc-types Name: ghc-%{pkg_name} -Version: 1.12.4.5 -Release: 1%{?dist} +Version: 1.12.4.1 +Release: 3%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -53,8 +53,6 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %post devel %ghc_pkg_recache @@ -65,16 +63,13 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files -f %{name}.files -%license LICENSE +%doc COPYING %files devel -f %{name}-devel.files %changelog -* Thu Sep 17 2015 Jens Petersen - 1.12.4.5-1 -- update to 1.12.4.5 - * Mon Aug 31 2015 Peter Robinson 1.12.4.1-3 - Rebuild (aarch64 vector hashes) diff --git a/sources b/sources index 7667a9e..3b4bf84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b73b9d1828208f9d985481c813aee1e5 pandoc-types-1.12.4.5.tar.gz +62cea7ac92a53a4023b9e849cf99792b pandoc-types-1.12.4.1.tar.gz From b6de8c9aebfbbe4728fbce99014cb47a8cfd45da Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:39:40 +0000 Subject: [PATCH 34/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 37f014c..61d23a3 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 1.12.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -70,6 +70,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.12.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Aug 31 2015 Peter Robinson 1.12.4.1-3 - Rebuild (aarch64 vector hashes) From 941008dc521085e29a1ea18758d2950e94076906 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 6 Mar 2016 00:21:56 +0900 Subject: [PATCH 35/71] update to 1.16.1 --- .gitignore | 1 + ghc-pandoc-types.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c02735a..b767b24 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /pandoc-types-1.12.3.1.tar.gz /pandoc-types-1.12.3.3.tar.gz /pandoc-types-1.12.4.1.tar.gz +/pandoc-types-1.16.1.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 61d23a3..de97fc0 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -3,8 +3,8 @@ %global pkg_name pandoc-types Name: ghc-%{pkg_name} -Version: 1.12.4.1 -Release: 4%{?dist} +Version: 1.16.1 +Release: 1%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -53,6 +53,8 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %post devel %ghc_pkg_recache @@ -63,13 +65,16 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files -%doc COPYING +%license LICENSE %files devel -f %{name}-devel.files %changelog +* Sat Mar 05 2016 Jens Petersen - 1.16.1-1 +- update to 1.16.1 + * Wed Feb 03 2016 Fedora Release Engineering - 1.12.4.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 3b4bf84..2253971 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62cea7ac92a53a4023b9e849cf99792b pandoc-types-1.12.4.1.tar.gz +9fed45bfc114c9530a16697945c20659 pandoc-types-1.16.1.tar.gz From 00eec98695ada38d825c005d96de71c9de2ac46e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 2 Jul 2016 07:34:44 +0900 Subject: [PATCH 36/71] add changelog --- ghc-pandoc-types.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index de97fc0..a3f7368 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -1,10 +1,11 @@ +# generated by cabal-rpm-0.9.12 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc-types Name: ghc-%{pkg_name} Version: 1.16.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -69,9 +70,13 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files devel -f %{name}-devel.files +%doc changelog %changelog +* Fri Jul 1 2016 Jens Petersen - 1.16.1-2 +- add changelog + * Sat Mar 05 2016 Jens Petersen - 1.16.1-1 - update to 1.16.1 From 30348829d5ab8cfcc6103c57155ffd713c9b7aae Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 19:15:47 +0900 Subject: [PATCH 37/71] no longer remove license --- ghc-pandoc-types.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index a3f7368..745e55f 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -54,8 +54,6 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %post devel %ghc_pkg_recache From aa79b0e671b53e26e9dde5317035a73662e9e043 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:45:27 +0000 Subject: [PATCH 38/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 745e55f..73243e4 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -5,7 +5,7 @@ Name: ghc-%{pkg_name} Version: 1.16.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -72,6 +72,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.16.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jul 1 2016 Jens Petersen - 1.16.1-2 - add changelog From 70a3ca2b1bd691bcbf549600ef996cdb98131247 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Feb 2017 10:54:46 +0900 Subject: [PATCH 39/71] update to 1.17.0.5 --- .gitignore | 1 + ghc-pandoc-types.spec | 28 +++++++++++++++++++++++----- sources | 2 +- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b767b24..6acbc70 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /pandoc-types-1.12.3.3.tar.gz /pandoc-types-1.12.4.1.tar.gz /pandoc-types-1.16.1.tar.gz +/pandoc-types-1.17.0.5.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 73243e4..da6f8c5 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -1,25 +1,36 @@ -# generated by cabal-rpm-0.9.12 +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc-types +%global pkgver %{pkg_name}-%{version} + +%bcond_with tests Name: ghc-%{pkg_name} -Version: 1.16.1 -Release: 3%{?dist} +Version: 1.17.0.5 +Release: 1%{?dist} Summary: Types for representing a structured document License: GPLv2+ 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 # Begin cabal-rpm deps: +BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-generics-devel BuildRequires: ghc-syb-devel +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-string-qq-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif # End cabal-rpm deps %description @@ -44,7 +55,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} %build @@ -55,6 +66,10 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_lib_install +%check +%cabal_test + + %post devel %ghc_pkg_recache @@ -72,6 +87,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 22 2017 Jens Petersen - 1.17.0.5-1 +- update to 1.17.0.5 + * Fri Feb 10 2017 Fedora Release Engineering - 1.16.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 2253971..5536094 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9fed45bfc114c9530a16697945c20659 pandoc-types-1.16.1.tar.gz +SHA512 (pandoc-types-1.17.0.5.tar.gz) = 911ee9e7e60fc3d00f8ff7c4a71ee302542f9f2445e959a0d3cfa0e5c165baed915c687790d1844d0900b761abeebab6da0d346bb44194f6d268ba1e5a41bd27 From 565fd415680f19247d596d2f0cac844e95828e74 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 25 Feb 2017 17:16:15 +0900 Subject: [PATCH 40/71] with recent ghc needs deepseq not deepseq-generics --- ghc-pandoc-types.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index da6f8c5..2f6e2cf 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -22,7 +22,7 @@ BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel -BuildRequires: ghc-deepseq-generics-devel +BuildRequires: ghc-deepseq-devel BuildRequires: ghc-syb-devel %if %{with tests} BuildRequires: ghc-HUnit-devel From 6cba7c9cd51b8b49d8a08a00c4cb16ae872ec01c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 09:51:16 +0000 Subject: [PATCH 41/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 2f6e2cf..3952c5f 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.17.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -87,6 +87,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.17.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Feb 22 2017 Jens Petersen - 1.17.0.5-1 - update to 1.17.0.5 From 16c344d11820ee5f9cde049cf44e24dbbb7d9bff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:27:25 +0000 Subject: [PATCH 42/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 3952c5f..ddfdf2c 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.17.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -87,6 +87,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.17.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.17.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 79ee3adaca3be933775d39ccdb603be99ab13b0f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:11:42 +0100 Subject: [PATCH 43/71] refresh to cabal-rpm-0.12.1 --- ghc-pandoc-types.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index ddfdf2c..2e0bf20 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc-types @@ -45,9 +45,12 @@ citeproc-hs) that use them. %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 @@ -70,6 +73,12 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From 6475cf97deb313b504d78a0e2abc3ec24393c3f3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:44:57 +0100 Subject: [PATCH 44/71] update to 1.17.3 --- .gitignore | 1 + ghc-pandoc-types.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6acbc70..591b5d0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /pandoc-types-1.12.4.1.tar.gz /pandoc-types-1.16.1.tar.gz /pandoc-types-1.17.0.5.tar.gz +/pandoc-types-1.17.3.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 2e0bf20..5cae19d 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.17.0.5 -Release: 3%{?dist} +Version: 1.17.3 +Release: 1%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -24,6 +24,7 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-syb-devel +BuildRequires: ghc-transformers-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-string-qq-devel @@ -96,6 +97,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jan 24 2018 Jens Petersen - 1.17.3-1 +- update to 1.17.3 + * Wed Aug 02 2017 Fedora Release Engineering - 1.17.0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 5536094..38af908 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pandoc-types-1.17.0.5.tar.gz) = 911ee9e7e60fc3d00f8ff7c4a71ee302542f9f2445e959a0d3cfa0e5c165baed915c687790d1844d0900b761abeebab6da0d346bb44194f6d268ba1e5a41bd27 +SHA512 (pandoc-types-1.17.3.tar.gz) = 7646ce51757b2abe2ca8de66316a1a268f72a3170270c524bbdd5fa8c97175036043ffbd1a4840b79b450d494f29dcc864670d76a9e551852728fc302613679a From 866542e685b185ea74d4a2ff39a3a3a3020a7380 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:03:07 +0900 Subject: [PATCH 45/71] drop ldconfig scriptlets --- ghc-pandoc-types.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 5cae19d..95b0e04 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -74,12 +74,6 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 1d0f6ece0dfb88e596cb2b0b8589d587ac76557a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:57:52 +0000 Subject: [PATCH 46/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 95b0e04..942f73d 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.17.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -91,6 +91,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.17.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 1.17.3-1 - update to 1.17.3 From 24f2dd2f7eac5edf36d7edc683ada83d66bd95b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:01:07 +0000 Subject: [PATCH 47/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 942f73d..67fb644 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.17.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -91,6 +91,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.17.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.17.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 2945e991165d45059e954cd8268f74caf0b199f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 23 Jul 2018 13:42:00 +0200 Subject: [PATCH 48/71] Rebuilt for #1607054 --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 67fb644..8f443ba 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.17.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -91,6 +91,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Jul 23 2018 Miro Hrončok - 1.17.3-4 +- Rebuilt for #1607054 + * Fri Jul 13 2018 Fedora Release Engineering - 1.17.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 6fb1ae713bd8f5e86f7e4cd8aa9bdb6e1c370502 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 28 Jul 2018 18:42:05 +0900 Subject: [PATCH 49/71] update to 1.17.3.1 --- .gitignore | 1 + ghc-pandoc-types.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 591b5d0..309c5da 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /pandoc-types-1.16.1.tar.gz /pandoc-types-1.17.0.5.tar.gz /pandoc-types-1.17.3.tar.gz +/pandoc-types-1.17.3.1.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 8f443ba..6103c92 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.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 pandoc-types @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.17.3 -Release: 4%{?dist} +Version: 1.17.3.1 +Release: 1%{?dist} Summary: Types for representing a structured document License: GPLv2+ @@ -91,6 +91,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Jul 28 2018 Jens Petersen - 1.17.3.1-1 +- update to 1.17.3.1 + * Mon Jul 23 2018 Miro Hrončok - 1.17.3-4 - Rebuilt for #1607054 diff --git a/sources b/sources index 38af908..4a542a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pandoc-types-1.17.3.tar.gz) = 7646ce51757b2abe2ca8de66316a1a268f72a3170270c524bbdd5fa8c97175036043ffbd1a4840b79b450d494f29dcc864670d76a9e551852728fc302613679a +SHA512 (pandoc-types-1.17.3.1.tar.gz) = 2eaf9f0f36d524422109ed5c4c1244e2381c13b3c923355fc99b5c8784a28706d231b74384f2b74c9957e0a711a9f180339d0776d4a9b814435fab5b68f450f2 From 381ad2182ce59ca9c21fb0c4303c566d870ee968 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 8 Aug 2018 18:48:51 +0200 Subject: [PATCH 50/71] update license to BSD --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 6103c92..e53c54a 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -11,7 +11,7 @@ Version: 1.17.3.1 Release: 1%{?dist} Summary: Types for representing a structured document -License: GPLv2+ +License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz @@ -91,6 +91,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Aug 8 2018 Jens Petersen +- update License tag to BSD + * Sat Jul 28 2018 Jens Petersen - 1.17.3.1-1 - update to 1.17.3.1 From 60f637137a37efb7624d339c3f0d5b1ae62ca3cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:50:43 +0000 Subject: [PATCH 51/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index e53c54a..c36f435 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.17.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Types for representing a structured document License: BSD @@ -91,6 +91,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.17.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Aug 8 2018 Jens Petersen - update License tag to BSD From 0647b569b2c5e978c491a71890f864aeb84f38c6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:46:34 +0800 Subject: [PATCH 52/71] refresh to cabal-rpm-0.13 --- ghc-pandoc-types.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index c36f435..8ab757b 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.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 pandoc-types @@ -8,16 +8,18 @@ Name: ghc-%{pkg_name} Version: 1.17.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Types for representing a structured document 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-QuickCheck-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-bytestring-devel @@ -59,15 +61,21 @@ This package provides the Haskell %{pkg_name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} +# End cabal-rpm setup %build +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install +# End cabal-rpm install %check @@ -83,7 +91,9 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -91,6 +101,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Feb 17 2019 Jens Petersen - 1.17.3.1-3 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 1.17.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From e674017c9a4293b4553787292f736a87df272ee7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 21 Feb 2019 12:06:56 +0800 Subject: [PATCH 53/71] update to 1.17.5.4 --- .gitignore | 1 + ghc-pandoc-types.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 309c5da..a5d9228 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /pandoc-types-1.17.0.5.tar.gz /pandoc-types-1.17.3.tar.gz /pandoc-types-1.17.3.1.tar.gz +/pandoc-types-1.17.5.4.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 8ab757b..6b8d455 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.17.3.1 -Release: 3%{?dist} +Version: 1.17.5.4 +Release: 1%{?dist} Summary: Types for representing a structured document License: BSD @@ -101,6 +101,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Feb 21 2019 Jens Petersen - 1.17.5.4-1 +- update to 1.17.5.4 + * Sun Feb 17 2019 Jens Petersen - 1.17.3.1-3 - refresh to cabal-rpm-0.13 diff --git a/sources b/sources index 4a542a4..58a4b92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pandoc-types-1.17.3.1.tar.gz) = 2eaf9f0f36d524422109ed5c4c1244e2381c13b3c923355fc99b5c8784a28706d231b74384f2b74c9957e0a711a9f180339d0776d4a9b814435fab5b68f450f2 +SHA512 (pandoc-types-1.17.5.4.tar.gz) = b70dee15e80a91276b04d883f878ca67fdf76195d775f92dc5bbe80c941834fbf067804ea6afa0b79cfc886e4f741d68a161318ab6afb968f159ccbe04a85ce1 From f464927b49bd64e8d77a317a2c26c910408ccd3c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:49:19 +0000 Subject: [PATCH 54/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 6b8d455..bf5e798 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.17.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Types for representing a structured document License: BSD @@ -101,6 +101,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.17.5.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 21 2019 Jens Petersen - 1.17.5.4-1 - update to 1.17.5.4 From ade9cb4b9aa0a2625d26480f20cf0585b895c3c1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:25:02 +0000 Subject: [PATCH 55/71] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-pandoc-types.spec | 53 ++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index bf5e798..84eb238 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.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 pandoc-types @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.17.5.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Types for representing a structured document License: BSD @@ -19,6 +19,12 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-aeson-devel @@ -48,11 +54,8 @@ citeproc-hs) that use them. %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} @@ -82,14 +104,6 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -100,7 +114,20 @@ This package provides the Haskell %{pkg_name} library development files. %doc changelog +%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 - 1.17.5.4-3 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 1.17.5.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1c184590e65af1c240d06a42e2a82a000d48e341 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:30:58 +0800 Subject: [PATCH 56/71] BR prof for lib and static for executable --- ghc-pandoc-types.spec | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 84eb238..5359cc2 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.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 pandoc-types @@ -19,20 +19,15 @@ 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-QuickCheck-devel -BuildRequires: ghc-aeson-devel -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-syb-devel -BuildRequires: ghc-transformers-devel +BuildRequires: ghc-QuickCheck-prof +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-base-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-syb-prof +BuildRequires: ghc-transformers-prof %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-string-qq-devel @@ -54,6 +49,7 @@ citeproc-hs) that use them. %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 39585b3e72ff82f2864131ba992ac2092b248dff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:09:19 +0000 Subject: [PATCH 57/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 5359cc2..9b7e383 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.17.5.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Types for representing a structured document License: BSD @@ -121,6 +121,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.17.5.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Aug 02 2019 Jens Petersen - 1.17.5.4-3 - add doc and prof subpackages (cabal-rpm-1.0.0) From 304550d88f4719b12563ebec9f5a98de9023e3d6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:51:22 +0800 Subject: [PATCH 58/71] refresh to cabal-rpm-2.0.2 --- ghc-pandoc-types.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 9b7e383..21d3852 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -1,11 +1,9 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pandoc-types %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} Version: 1.17.5.4 Release: 4%{?dist} @@ -28,13 +26,6 @@ BuildRequires: ghc-containers-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-syb-prof BuildRequires: ghc-transformers-prof -%if %{with tests} -BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-string-qq-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-hunit-devel -BuildRequires: ghc-test-framework-quickcheck2-devel -%endif # End cabal-rpm deps %description @@ -62,6 +53,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 +64,7 @@ This package provides the Haskell %{pkg_name} library documentation. %package prof Summary: Haskell %{pkg_name} profiling library Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) %description prof This package provides the Haskell %{pkg_name} profiling library. @@ -96,8 +89,14 @@ 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 + + +%postun devel +%ghc_pkg_recache +%endif %files -f %{name}.files @@ -112,6 +111,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From 46d5854adc1e4329782e6c06dd424c0538a34a63 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 11:49:17 +0800 Subject: [PATCH 59/71] update to 1.17.6.1 --- .gitignore | 1 + ghc-pandoc-types.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a5d9228..47f7f32 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /pandoc-types-1.17.3.tar.gz /pandoc-types-1.17.3.1.tar.gz /pandoc-types-1.17.5.4.tar.gz +/pandoc-types-1.17.6.1.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 21d3852..1cbc7f0 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 1.17.5.4 -Release: 4%{?dist} +Version: 1.17.6.1 +Release: 1%{?dist} Summary: Types for representing a structured document License: BSD @@ -121,6 +121,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Feb 14 2020 Jens Petersen - 1.17.6.1-1 +- update to 1.17.6.1 + * Tue Jan 28 2020 Fedora Release Engineering - 1.17.5.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 58a4b92..43e2b2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pandoc-types-1.17.5.4.tar.gz) = b70dee15e80a91276b04d883f878ca67fdf76195d775f92dc5bbe80c941834fbf067804ea6afa0b79cfc886e4f741d68a161318ab6afb968f159ccbe04a85ce1 +SHA512 (pandoc-types-1.17.6.1.tar.gz) = f6de0793ad2680faf4595154ebe376e1830c93927f31b728e6e9aabdac467267cd7c2333b6ba420ab808da1228e7265d23455d87b8f93d81f04aa97888fab6e1 From 86fc12b6e2a2a4223de6378e8b44d8da0a1b5438 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:27:38 +0800 Subject: [PATCH 60/71] refresh to cabal-rpm-2.0.5 --- ghc-pandoc-types.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 1cbc7f0..7abd48b 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.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 pandoc-types %global pkgver %{pkg_name}-%{version} From 3eeb7db41a39201bc44022cafc5cb7e30807fa76 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 10 Jun 2020 11:39:24 +0800 Subject: [PATCH 61/71] update to 1.20 --- .gitignore | 1 + ghc-pandoc-types.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 47f7f32..c095957 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /pandoc-types-1.17.3.1.tar.gz /pandoc-types-1.17.5.4.tar.gz /pandoc-types-1.17.6.1.tar.gz +/pandoc-types-1.20.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 7abd48b..0c2d5e9 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -5,7 +5,7 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 1.17.6.1 +Version: 1.20 Release: 1%{?dist} Summary: Types for representing a structured document @@ -25,6 +25,7 @@ BuildRequires: ghc-bytestring-prof BuildRequires: ghc-containers-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-syb-prof +BuildRequires: ghc-text-prof BuildRequires: ghc-transformers-prof # End cabal-rpm deps @@ -121,6 +122,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Wed Jun 10 2020 Jens Petersen - 1.20-1 +- update to 1.20 + * Fri Feb 14 2020 Jens Petersen - 1.17.6.1-1 - update to 1.17.6.1 diff --git a/sources b/sources index 43e2b2b..34e6bf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pandoc-types-1.17.6.1.tar.gz) = f6de0793ad2680faf4595154ebe376e1830c93927f31b728e6e9aabdac467267cd7c2333b6ba420ab808da1228e7265d23455d87b8f93d81f04aa97888fab6e1 +SHA512 (pandoc-types-1.20.tar.gz) = 36c658093237246a344dc65bf9e214b250ea1a0aecf9931d80299f44ee152553c4326948bfae8e0f3e5aaabe93bc7a9aca0c79383e48b0f9d2696383df2b40ee From 70d75fe7cedef64d30d9befbce1bac4eee425ed9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:56:15 +0800 Subject: [PATCH 62/71] refresh to cabal-rpm-2.0.6 --- ghc-pandoc-types.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 0c2d5e9..2049b5e 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -1,9 +1,11 @@ -# 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 pandoc-types %global pkgver %{pkg_name}-%{version} +# testsuite missing deps: test-framework test-framework-hunit test-framework-quickcheck2 + Name: ghc-%{pkg_name} Version: 1.20 Release: 1%{?dist} @@ -90,16 +92,6 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm install -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE From 1e15c1058111d9e2debf8031215c337b9bc9dab6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:28:46 +0000 Subject: [PATCH 63/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 2049b5e..220ef0a 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Types for representing a structured document License: BSD @@ -114,6 +114,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jun 10 2020 Jens Petersen - 1.20-1 - update to 1.20 From cf67257590045a2d2e2b0f3de8cfd8291e0260f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:18:05 +0000 Subject: [PATCH 64/71] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-pandoc-types.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 220ef0a..62007a7 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Types for representing a structured document License: BSD @@ -114,6 +114,10 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.20-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9f6c3afe460767b6e1af07e121314ed787c21b4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:33:20 +0000 Subject: [PATCH 65/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 62007a7..6385bb3 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Types for representing a structured document License: BSD @@ -114,6 +114,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 1.20-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3231d7d93f6f23bc951a08a18a78fb3fc2e59dcc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:02:55 +0000 Subject: [PATCH 66/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 6385bb3..3f38f97 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Types for representing a structured document License: BSD @@ -114,6 +114,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.20-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.20-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 209f466ab9b77a7ed8e7c46360f6636cb13c5858 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 29 Jan 2021 00:19:00 +0800 Subject: [PATCH 67/71] update to 1.22 --- .gitignore | 1 + ghc-pandoc-types.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c095957..7ce90f4 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /pandoc-types-1.17.5.4.tar.gz /pandoc-types-1.17.6.1.tar.gz /pandoc-types-1.20.tar.gz +/pandoc-types-1.22.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 3f38f97..e63d580 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -7,8 +7,8 @@ # testsuite missing deps: test-framework test-framework-hunit test-framework-quickcheck2 Name: ghc-%{pkg_name} -Version: 1.20 -Release: 5%{?dist} +Version: 1.22 +Release: 1%{?dist} Summary: Types for representing a structured document License: BSD @@ -114,6 +114,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Aug 5 2021 Jens Petersen - 1.22-1 +- update to 1.22 + * Thu Jul 22 2021 Fedora Release Engineering - 1.20-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 34e6bf1..748e5c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pandoc-types-1.20.tar.gz) = 36c658093237246a344dc65bf9e214b250ea1a0aecf9931d80299f44ee152553c4326948bfae8e0f3e5aaabe93bc7a9aca0c79383e48b0f9d2696383df2b40ee +SHA512 (pandoc-types-1.22.tar.gz) = b5f7c15b31c5ee6faa4d7574baa32d252b1e79350840f2d7ac3f3896b969e18241e514fb06e85aa97d7a74c0904839d04a4d8e5d4ff86d0a2b80957b99279ee0 From 32b4a529598ac6a14d2a333ce11b033c025cd360 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:12 +0800 Subject: [PATCH 68/71] refresh to cabal-rpm-2.0.9 --- ghc-pandoc-types.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index e63d580..9a8ff40 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.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 pandoc-types @@ -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. From 24c517c6b0dac9e04c63755b1d76a31ba4624960 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:19:27 +0000 Subject: [PATCH 69/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-pandoc-types.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 9a8ff40..aa040e0 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Types for representing a structured document License: BSD @@ -115,6 +115,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 1.22-1 - update to 1.22 From ad3cd7291e5ffcbc1564cf05e1f69a70c70ecd8f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Jun 2022 14:11:27 +0800 Subject: [PATCH 70/71] update to 1.22.1 --- .gitignore | 1 + ghc-pandoc-types.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7ce90f4..0c8c94a 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /pandoc-types-1.17.6.1.tar.gz /pandoc-types-1.20.tar.gz /pandoc-types-1.22.tar.gz +/pandoc-types-1.22.1.tar.gz diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index aa040e0..56c446c 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -7,8 +7,8 @@ # testsuite missing deps: test-framework test-framework-hunit test-framework-quickcheck2 Name: ghc-%{pkg_name} -Version: 1.22 -Release: 2%{?dist} +Version: 1.22.1 +Release: 1%{?dist} Summary: Types for representing a structured document License: BSD @@ -115,6 +115,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jun 07 2022 Jens Petersen - 1.22.1-1 +- https://hackage.haskell.org/package/pandoc-types-1.22.1/changelog + * Thu Jan 20 2022 Fedora Release Engineering - 1.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 748e5c2..db2b71d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pandoc-types-1.22.tar.gz) = b5f7c15b31c5ee6faa4d7574baa32d252b1e79350840f2d7ac3f3896b969e18241e514fb06e85aa97d7a74c0904839d04a4d8e5d4ff86d0a2b80957b99279ee0 +SHA512 (pandoc-types-1.22.1.tar.gz) = e9041c69c701084f7c05b742d84ab0570d21b0856ed2a221d925763ec500586255be92b810afb999ea51c9be3a8ec0f2e026c4ade1a681c1464a4b5d94334ecb From f29f8317ad515557ce48791053cf98ffa95ac453 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:50:23 +0300 Subject: [PATCH 71/71] 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 db2b71d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (pandoc-types-1.22.1.tar.gz) = e9041c69c701084f7c05b742d84ab0570d21b0856ed2a221d925763ec500586255be92b810afb999ea51c9be3a8ec0f2e026c4ade1a681c1464a4b5d94334ecb