From 5bdf99cd66591a8c1be34d7940689352eae70a8c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 25 Jan 2023 00:50:59 +0800 Subject: [PATCH] emojis library moved to ghc-doctemplates --- pandoc.spec | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pandoc.spec b/pandoc.spec index eba6a4d..ddf01d7 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -6,7 +6,6 @@ %global hsluamodulesystem hslua-module-system-1.0.2 %global ipynb ipynb-0.2 -%global emojis emojis-0.1.2 %global jirawikimarkup jira-wiki-markup-1.4.0 %global citeproc citeproc-0.8.1%global commonmark commonmark-0.2.2 %global commonmarkextensions commonmark-extensions-0.2.3.3 @@ -21,7 +20,7 @@ %global lpeg lpeg-1.0.3 %global pandocluamarshal pandoc-lua-marshal-0.1.7 -%global subpkgs %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{unicodecollation} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} %{hsluamodulepath} %{base64} %{gridtables} %{hsluaaeson} %{hsluamoduledoclayout} %{hsluamoduleversion} %{lpeg} %{pandocluamarshal} +%global subpkgs %{hsluamodulesystem} %{ipynb} %{jirawikimarkup} %{unicodecollation} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} %{hsluamodulepath} %{base64} %{gridtables} %{hsluaaeson} %{hsluamoduledoclayout} %{hsluamoduleversion} %{lpeg} %{pandocluamarshal} # testsuite missing deps: tasty-golden tasty-lua @@ -37,21 +36,20 @@ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hsluamodulesystem}.tar.gz Source2: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz -Source3: https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz -Source4: https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz -Source5: https://hackage.haskell.org/package/%{citeproc}/%{citeproc}.tar.gz -Source6: https://hackage.haskell.org/package/%{commonmark}/%{commonmark}.tar.gz -Source7: https://hackage.haskell.org/package/%{commonmarkextensions}/%{commonmarkextensions}.tar.gz -Source8: https://hackage.haskell.org/package/%{commonmarkpandoc}/%{commonmarkpandoc}.tar.gz -Source9: https://hackage.haskell.org/package/%{hsluamodulepath}/%{hsluamodulepath}.tar.gz -Source10: https://hackage.haskell.org/package/%{unicodecollation}/%{unicodecollation}.tar.gz -Source11: https://hackage.haskell.org/package/%{base64}/%{base64}.tar.gz -Source12: https://hackage.haskell.org/package/%{gridtables}/%{gridtables}.tar.gz -Source13: https://hackage.haskell.org/package/%{hsluaaeson}/%{hsluaaeson}.tar.gz -Source14: https://hackage.haskell.org/package/%{hsluamoduledoclayout}/%{hsluamoduledoclayout}.tar.gz -Source15: https://hackage.haskell.org/package/%{hsluamoduleversion}/%{hsluamoduleversion}.tar.gz -Source16: https://hackage.haskell.org/package/%{lpeg}/%{lpeg}.tar.gz -Source17: https://hackage.haskell.org/package/%{pandocluamarshal}/%{pandocluamarshal}.tar.gz +Source3: https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz +Source4: https://hackage.haskell.org/package/%{citeproc}/%{citeproc}.tar.gz +Source5: https://hackage.haskell.org/package/%{commonmark}/%{commonmark}.tar.gz +Source6: https://hackage.haskell.org/package/%{commonmarkextensions}/%{commonmarkextensions}.tar.gz +Source7: https://hackage.haskell.org/package/%{commonmarkpandoc}/%{commonmarkpandoc}.tar.gz +Source8: https://hackage.haskell.org/package/%{hsluamodulepath}/%{hsluamodulepath}.tar.gz +Source9: https://hackage.haskell.org/package/%{unicodecollation}/%{unicodecollation}.tar.gz +Source10: https://hackage.haskell.org/package/%{base64}/%{base64}.tar.gz +Source11: https://hackage.haskell.org/package/%{gridtables}/%{gridtables}.tar.gz +Source12: https://hackage.haskell.org/package/%{hsluaaeson}/%{hsluaaeson}.tar.gz +Source13: https://hackage.haskell.org/package/%{hsluamoduledoclayout}/%{hsluamoduledoclayout}.tar.gz +Source14: https://hackage.haskell.org/package/%{hsluamoduleversion}/%{hsluamoduleversion}.tar.gz +Source15: https://hackage.haskell.org/package/%{lpeg}/%{lpeg}.tar.gz +Source16: https://hackage.haskell.org/package/%{pandocluamarshal}/%{pandocluamarshal}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -82,7 +80,7 @@ BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-doclayout-devel BuildRequires: ghc-doctemplates-devel -#BuildRequires: ghc-emojis-devel +BuildRequires: ghc-emojis-devel BuildRequires: ghc-exceptions-devel BuildRequires: ghc-file-embed-devel BuildRequires: ghc-filepath-devel @@ -162,7 +160,7 @@ BuildRequires: ghc-deepseq-prof BuildRequires: ghc-directory-prof BuildRequires: ghc-doclayout-prof BuildRequires: ghc-doctemplates-prof -#BuildRequires: ghc-emojis-prof +BuildRequires: ghc-emojis-prof BuildRequires: ghc-exceptions-prof BuildRequires: ghc-file-embed-prof BuildRequires: ghc-filepath-prof @@ -412,7 +410,6 @@ This package provides the Haskell %{name} profiling library. %if %{defined ghclibdir} %ghc_lib_subpackage -l MIT %{hsluamodulesystem} %ghc_lib_subpackage -l BSD-3-Clause %{ipynb} -%ghc_lib_subpackage -l BSD-3-Clause %{emojis} %ghc_lib_subpackage -l MIT %{jirawikimarkup} %ghc_lib_subpackage -l BSD-2-Clause %{citeproc} %ghc_lib_subpackage -l BSD-3-Clause %{commonmark} @@ -434,7 +431,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 +%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 # End cabal-rpm setup @@ -514,6 +511,7 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} * Sun Jan 22 2023 Jens Petersen - 2.19.2-19 - https://hackage.haskell.org/package/pandoc-2.19.2/changelog - refresh to cabal-rpm-2.1.0 with SPDX migration +- emojis library moved to ghc-doctemplates * Fri Jul 22 2022 Fedora Release Engineering - 2.14.0.3-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild