update to 0.8 with 4 additional deps

.gitignore

@@ -1,3 +1,8 @@
 /doctemplates-0.1.0.2.tar.gz
 /doctemplates-0.2.1.tar.gz
 /doctemplates-0.2.2.1.tar.gz
+/doctemplates-0.8.tar.gz
+/doclayout-0.2.0.1.tar.gz
+/text-conversions-0.3.0.tar.gz
+/HsYAML-0.2.1.0.tar.gz
+/errors-2.3.0.tar.gz

ghc-doctemplates.spec

@@ -1,49 +1,68 @@
-# generated by cabal-rpm-2.0.5
+# generated by cabal-rpm-2.0.5 --subpackage
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
 %global pkg_name doctemplates
 %global pkgver %{pkg_name}-%{version}
 
-%ifnarch s390x
+%global HsYAML HsYAML-0.2.1.0
-%bcond_without tests
+%global doclayout doclayout-0.2.0.1
-%else
+%global errors errors-2.3.0
-%bcond_with tests
+%global textconversions text-conversions-0.3.0
-%endif
+%global subpkgs %{HsYAML} %{doclayout} %{errors} %{textconversions}
+
+# testsuite missing deps: doclayout tasty-golden
 
 Name:           ghc-%{pkg_name}
-Version:        0.2.2.1
+Version:        0.8
-Release:        7%{?dist}
+# can only be reset when all subpkgs bumped
+Release:        1%{?dist}
 Summary:        Pandoc-style document templates
 
 License:        BSD
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
+Source1:        https://hackage.haskell.org/package/%{HsYAML}/%{HsYAML}.tar.gz
+Source2:        https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.tar.gz
+Source3:        https://hackage.haskell.org/package/%{errors}/%{errors}.tar.gz
+Source4:        https://hackage.haskell.org/package/%{textconversions}/%{textconversions}.tar.gz
 # End cabal-rpm sources
 
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
+BuildRequires:  ghc-rpm-macros-extra
+#BuildRequires:  ghc-HsYAML-prof
 BuildRequires:  ghc-aeson-prof
 BuildRequires:  ghc-base-prof
-BuildRequires:  ghc-blaze-html-prof
-BuildRequires:  ghc-blaze-markup-prof
-BuildRequires:  ghc-bytestring-prof
 BuildRequires:  ghc-containers-prof
+#BuildRequires:  ghc-doclayout-prof
+BuildRequires:  ghc-filepath-prof
+BuildRequires:  ghc-mtl-prof
 BuildRequires:  ghc-parsec-prof
+BuildRequires:  ghc-safe-prof
 BuildRequires:  ghc-scientific-prof
 BuildRequires:  ghc-text-prof
+#BuildRequires:  ghc-text-conversions-prof
 BuildRequires:  ghc-unordered-containers-prof
 BuildRequires:  ghc-vector-prof
-%if %{with tests}
+# for missing dep 'HsYAML':
-BuildRequires:  ghc-hspec-devel
+BuildRequires:  ghc-bytestring-prof
-%endif
+BuildRequires:  ghc-deepseq-prof
+# for missing dep 'errors':
+BuildRequires:  ghc-exceptions-prof
+BuildRequires:  ghc-transformers-prof
+BuildRequires:  ghc-transformers-compat-prof
+# for missing dep 'text-conversions':
+BuildRequires:  ghc-base16-bytestring-prof
+BuildRequires:  ghc-base64-bytestring-prof
+BuildRequires:  ghc-bytestring-prof
 # End cabal-rpm deps
 
 %description
-This is the templating system used by pandoc.  It was formerly
+This is the text templating system used by pandoc. It supports variable
-a module in pandoc. It has been split off to make it easier
+interpolation, iteration, tests for non-blank values, pipes, and partials.
-to use independently.
+Templates are rendered to doclayout Docs, and variable values may come from a
+variety of different sources, including aeson Values.
 
 
 %package devel
@@ -80,30 +99,41 @@ This package provides the Haskell %{pkg_name} profiling library.
 %endif
 
 
+%global main_version %{version}
+
+%if %{defined ghclibdir}
+%ghc_lib_subpackage %{HsYAML}
+%ghc_lib_subpackage %{doclayout}
+%ghc_lib_subpackage %{errors}
+%ghc_lib_subpackage %{textconversions}
+%endif
+
+%global version %{main_version}
+
+
 %prep
 # Begin cabal-rpm setup:
-%setup -q -n %{pkgver}
+%setup -q -n %{pkgver} -a1 -a2 -a3 -a4
 # End cabal-rpm setup
 
 
 %build
 # Begin cabal-rpm build:
+%ghc_libs_build %{subpkgs}
 %ghc_lib_build
 # End cabal-rpm build
 
 
 %install
 # Begin cabal-rpm install
+%ghc_libs_install %{subpkgs}
 %ghc_lib_install
+%ghc_fix_rpath %{pkgver}
 
-rm %{buildroot}%{_datadir}/%{pkgver}/README.md
+rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md}
 # End cabal-rpm install
 
 
-%check
-%cabal_test
-
-
 %if 0%{?fedora} < 31 || 0%{?rhel} < 8
 %post devel
 %ghc_pkg_recache
@@ -121,7 +151,7 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md
 
 
 %files devel -f %{name}-devel.files
-%doc README.md
+%doc README.md changelog.md
 
 
 %if %{with haddock}
@@ -136,6 +166,10 @@ rm %{buildroot}%{_datadir}/%{pkgver}/README.md
 
 
 %changelog
+* Sun Jun 07 2020 Jens Petersen <petersen@redhat.com> - 0.8-1
+- update to 0.8
+- subpackage HsYAML, doclayout, text-conversions, and errors
+
 * Wed Feb 19 2020 Jens Petersen <petersen@redhat.com> - 0.2.2.1-7
 - refresh to cabal-rpm-2.0.2
 

sources

@@ -1 +1,5 @@
-SHA512 (doctemplates-0.2.2.1.tar.gz) = e1ad0d61dc97a69febf55ad76ee05e6696b76b0df5ee925072e934b977d1ca4c8d9ce0bc9acb311ec1992ce783e86fcaec93a93fc47fecffbd0071f002013485
+SHA512 (HsYAML-0.2.1.0.tar.gz) = f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
+SHA512 (doclayout-0.2.0.1.tar.gz) = 1a5f847106762a6808c5dd1512a30a3d9cac0c0b4d5f0a9c35c5eb9c6326fe49117c0f317f5b7ff63363c3fbc2c3a9689194aa74e5f21b16045614909d439d9e
+SHA512 (doctemplates-0.8.tar.gz) = 1e83c890c69980cf0ac814b0654427df548f98b47f483d766996b53f0035119ae284fdd33e7145607a199cf13a3a99a6572fb4ad7787217b6232bc96d763efcf
+SHA512 (errors-2.3.0.tar.gz) = dddfc63505fd7023c4a669b3cc3d736cf7ecb774b53dcdfeee2d203dcdf4684f5d149a1c217134de214b64af4e154a3ef08b315615c85a1c734ceb42e80823b4
+SHA512 (text-conversions-0.3.0.tar.gz) = 767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec