diff --git a/pandoc.spec b/pandoc.spec index 0b6f519..9867d10 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,15 +4,12 @@ %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} -%global unicodetransforms unicode-transforms-0.3.6 -# needed by unicode-transforms -%global bitarray bitarray-0.0.1.1 %global hsluamodulesystem hslua-module-system-0.2.1 %global ipynb ipynb-0.1.0.1 %global emojis emojis-0.1 %global jirawikimarkup jira-wiki-markup-1.1.4 %global basenoprelude base-noprelude-4.13.0.0 -%global subpkgs %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{basenoprelude} +%global subpkgs %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{basenoprelude} # testsuite missing deps: base-noprelude tasty-golden tasty-lua @@ -26,13 +23,11 @@ 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/%{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 -Source7: https://hackage.haskell.org/package/%{basenoprelude}/%{basenoprelude}.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/%{basenoprelude}/%{basenoprelude}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -92,7 +87,7 @@ BuildRequires: ghc-texmath-prof BuildRequires: ghc-text-prof BuildRequires: ghc-text-conversions-prof BuildRequires: ghc-time-prof -#BuildRequires: ghc-unicode-transforms-prof +BuildRequires: ghc-unicode-transforms-prof BuildRequires: ghc-unix-prof BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-vector-prof @@ -100,11 +95,6 @@ BuildRequires: ghc-xml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof Requires: %{name}-common = %{version}-%{release} -# for missing dep 'unicode-transforms': -BuildRequires: ghc-base-prof -# for missing dep 'bitarray': -BuildRequires: ghc-array-prof -BuildRequires: ghc-base-prof # for missing dep 'hslua-module-system': BuildRequires: ghc-base-prof # for missing dep 'ipynb': @@ -218,8 +208,6 @@ This package provides the Haskell %{name} profiling library. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{unicodetransforms} -%ghc_lib_subpackage %{bitarray} %ghc_lib_subpackage %{hsluamodulesystem} %ghc_lib_subpackage %{ipynb} %ghc_lib_subpackage %{emojis} @@ -232,7 +220,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 +%setup -q -a1 -a2 -a3 -a4 -a5 # End cabal-rpm setup @@ -301,6 +289,7 @@ echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude * Fri Jun 19 2020 Jens Petersen - 2.9.2.1-5 - https://hackage.haskell.org/package/pandoc-2.9.2.1/changelog - subpackage base-noprelude +- bitarray and unicode-transforms were packaged * Wed Jun 10 2020 Jens Petersen - 2.9.1.1-4 - https://hackage.haskell.org/package/pandoc-2.9.1.1/changelog diff --git a/sources b/sources index 547946d..4e55f9f 100644 --- a/sources +++ b/sources @@ -1,8 +1,6 @@ SHA512 (base-noprelude-4.13.0.0.tar.gz) = 658ff8e23648d490d97de1083a8412194076f8a0a07fe5843d0d68887225294f296ad2e1c32b9bae3fa32e1f94261aaeb350eec47642edb35ca5ba1dd1a69ecf -SHA512 (bitarray-0.0.1.1.tar.gz) = 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602 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.1.4.tar.gz) = 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f SHA512 (pandoc-2.9.2.1.tar.gz) = 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2 -SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b