From 6686ce0b6af764748d103af83fb8132f418898d3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Jun 2020 01:12:53 +0800 Subject: [PATCH] move HsYAML, doclayout and text-conversions to ghc-doctemplates --- .gitignore | 3 --- pandoc.spec | 29 ++++++++++------------------- sources | 3 --- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 13abf10..b5f4ad5 100644 --- a/.gitignore +++ b/.gitignore @@ -31,10 +31,7 @@ /hslua-module-system-0.2.1.tar.gz /ipynb-0.1.tar.gz /pandoc-2.7.3.tar.gz -/HsYAML-0.2.1.0.tar.gz -/doclayout-0.2.0.1.tar.gz /emojis-0.1.tar.gz /ipynb-0.1.0.1.tar.gz /jira-wiki-markup-1.0.0.tar.gz /pandoc-2.9.1.1.tar.gz -/text-conversions-0.3.0.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 4dd5b9a..693b92f 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,16 +4,13 @@ %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} -%global HsYAML HsYAML-0.2.1.0 %global unicodetransforms unicode-transforms-0.3.6 # needed by unicode-transforms %global bitarray bitarray-0.0.1.1 -%global doclayout doclayout-0.2.0.1 %global emojis emojis-0.1 %global hsluamodulesystem hslua-module-system-0.2.1 %global ipynb ipynb-0.1.0.1 %global jirawikimarkup jira-wiki-markup-1.0.0 -%global textconversions text-conversions-0.3.0 %global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb} %{doclayout} %{emojis} %{jirawikimarkup} %{textconversions} Name: %{pkg_name} @@ -26,15 +23,12 @@ License: GPLv2+ Url: https://hackage.haskell.org/package/%{name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{HsYAML}/%{HsYAML}.tar.gz -Source2: https://hackage.haskell.org/package/%{unicodetransforms}/%{unicodetransforms}.tar.gz -Source3: https://hackage.haskell.org/package/%{bitarray}/%{bitarray}.tar.gz -Source4: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hsluamodulesystem}.tar.gz -Source5: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz -Source6: https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.tar.gz -Source7: https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz -Source8: https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz -Source9: https://hackage.haskell.org/package/%{textconversions}/%{textconversions}.tar.gz +Source1: https://hackage.haskell.org/package/%{unicodetransforms}/%{unicodetransforms}.tar.gz +Source2: https://hackage.haskell.org/package/%{bitarray}/%{bitarray}.tar.gz +Source3: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hsluamodulesystem}.tar.gz +Source4: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz +Source5: https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz +Source6: https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -42,7 +36,7 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-Glob-prof BuildRequires: ghc-HTTP-prof -#BuildRequires: ghc-HsYAML-prof +BuildRequires: ghc-HsYAML-prof BuildRequires: ghc-JuicyPixels-prof BuildRequires: ghc-SHA-prof BuildRequires: ghc-aeson-prof @@ -60,7 +54,7 @@ BuildRequires: ghc-containers-prof BuildRequires: ghc-data-default-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-directory-prof -#BuildRequires: ghc-doclayout-prof +BuildRequires: ghc-doclayout-prof BuildRequires: ghc-doctemplates-prof #BuildRequires: ghc-emojis-prof BuildRequires: ghc-exceptions-prof @@ -91,7 +85,7 @@ BuildRequires: ghc-tagsoup-prof BuildRequires: ghc-temporary-prof BuildRequires: ghc-texmath-prof BuildRequires: ghc-text-prof -#BuildRequires: ghc-text-conversions-prof +BuildRequires: ghc-text-conversions-prof BuildRequires: ghc-time-prof #BuildRequires: ghc-unicode-transforms-prof BuildRequires: ghc-unix-prof @@ -203,15 +197,12 @@ This package provides the Haskell %{name} profiling library. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{HsYAML} %ghc_lib_subpackage %{unicodetransforms} %ghc_lib_subpackage %{bitarray} %ghc_lib_subpackage %{hsluamodulesystem} %ghc_lib_subpackage %{ipynb} -%ghc_lib_subpackage %{doclayout} %ghc_lib_subpackage %{emojis} %ghc_lib_subpackage %{jirawikimarkup} -%ghc_lib_subpackage %{textconversions} %endif %global version %{main_version} @@ -219,7 +210,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 +%setup -q -a1 -a2 -a3 -a4 -a5 -a6 # End cabal-rpm setup diff --git a/sources b/sources index 61d3ea4..98bc9e2 100644 --- a/sources +++ b/sources @@ -1,10 +1,7 @@ SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b -SHA512 (HsYAML-0.2.1.0.tar.gz) = f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304 SHA512 (bitarray-0.0.1.1.tar.gz) = 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602 -SHA512 (doclayout-0.2.0.1.tar.gz) = 1a5f847106762a6808c5dd1512a30a3d9cac0c0b4d5f0a9c35c5eb9c6326fe49117c0f317f5b7ff63363c3fbc2c3a9689194aa74e5f21b16045614909d439d9e SHA512 (emojis-0.1.tar.gz) = 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2 SHA512 (hslua-module-system-0.2.1.tar.gz) = 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b SHA512 (ipynb-0.1.0.1.tar.gz) = b1e547ac9353c84619832c723586146d2fd72c85c75d11b9ff99c16852ae2dfd1a2d61382ab9cc54bc9ad2bf8e1c3c0a8dc50d49c034d525e7a3393057a0275b SHA512 (jira-wiki-markup-1.0.0.tar.gz) = 74df439b64939ebad80ecdc2888829d78a8ae030a855de8e50a8b0076e036c79e5a96eb07a943fc211645c8a89bf508c170b2af0c923ca8f53f4b5cd401a7549 SHA512 (pandoc-2.9.1.1.tar.gz) = de9afcaa1dfa3c253e5a108a3ea30771d90b820f9a033753fc1bce89293ec6c847073eb77ab6682a746d4719ba258ab36e299b6b330da50f49399fc5fcf54002 -SHA512 (text-conversions-0.3.0.tar.gz) = 767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec