update to 0.10.0.2

.gitignore

@@ -11,3 +11,7 @@
 /text-conversions-0.3.1.tar.gz
 /doclayout-0.3.0.2.tar.gz
 /doclayout-0.3.1.1.tar.gz
+/doctemplates-0.10.0.2.tar.gz
+/emojis-0.1.2.tar.gz
+/doclayout-0.4.tar.gz
+/text-conversions-0.3.1.1.tar.gz

doctemplates-0.10.0.2.cabal

@@ -0,0 +1,89 @@
+name:                doctemplates
+version:             0.10.0.2
+x-revision: 1
+synopsis:            Pandoc-style document templates
+description:         This is the text templating system used by pandoc.
+                     It supports variable interpolation, iteration,
+                     tests for non-blank values, pipes, and partials.
+                     Templates are rendered to doclayout Docs,
+                     and variable values may come from a variety of
+                     different sources, including aeson Values.
+homepage:            https://github.com/jgm/doctemplates#readme
+license:             BSD3
+license-file:        LICENSE
+author:              John MacFarlane
+maintainer:          jgm@berkeley.edu
+copyright:           2016-19 John MacFarlane
+category:            Text
+build-type:          Simple
+-- extra-source-files:
+data-files:          README.md
+                     changelog.md
+extra-source-files:  test/*.test
+                     test/*.txt
+                     test/*.tex
+cabal-version:       >=1.10
+
+library
+  hs-source-dirs:      src
+  exposed-modules:     Text.DocTemplates
+                       Text.DocTemplates.Parser
+                       Text.DocTemplates.Internal
+  build-depends:       base >= 4.9 && < 5,
+                       safe,
+                       text-conversions,
+                       aeson,
+                       HsYAML >= 0.2 && < 0.3,
+                       text,
+                       doclayout >= 0.4 && < 0.5,
+                       containers,
+                       vector,
+                       filepath,
+                       parsec,
+                       mtl,
+                       scientific
+  if !impl(ghc >= 8.0)
+    build-depends:     semigroups == 0.18.*
+  default-language:    Haskell2010
+  ghc-options:         -Wall -fno-warn-unused-do-bind
+
+test-suite doctemplates-test
+  type:                exitcode-stdio-1.0
+  hs-source-dirs:      test
+  main-is:             test.hs
+  build-depends:       base,
+                       doctemplates,
+                       doclayout >= 0.4 && < 0.5,
+                       containers,
+                       aeson,
+                       Glob,
+                       tasty,
+                       tasty-golden,
+                       tasty-hunit,
+                       filepath,
+                       temporary,
+                       bytestring,
+                       text
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
+  default-language:    Haskell2010
+
+benchmark doctemplates-bench
+  Type:            exitcode-stdio-1.0
+  Main-Is:         bench.hs
+  Hs-Source-Dirs:  bench
+  Build-Depends:   doctemplates,
+                   doclayout >= 0.4 && < 0.5,
+                   base >= 4.8 && < 5,
+                   criterion >= 1.0,
+                   filepath,
+                   aeson,
+                   text,
+                   containers,
+                   mtl
+  Ghc-Options:   -rtsopts -Wall -fno-warn-unused-do-bind
+  Default-Language: Haskell2010
+
+
+source-repository head
+  type:     git
+  location: https://github.com/jgm/doctemplates

ghc-doctemplates.spec

@@ -4,17 +4,18 @@
 %global pkg_name doctemplates
 %global pkgver %{pkg_name}-%{version}
 
-%global doclayout doclayout-0.3.1.1
+%global doclayout doclayout-0.4
+%global emojis emojis-0.1.2
 %global errors errors-2.3.0
-%global textconversions text-conversions-0.3.1
+%global textconversions text-conversions-0.3.1.1
-%global subpkgs %{doclayout} %{errors} %{textconversions}
+%global subpkgs %{emojis} %{doclayout} %{errors} %{textconversions}
 
 # testsuite missing deps: tasty-golden
 
 Name:           ghc-%{pkg_name}
-Version:        0.9
+Version:        0.10.0.2
 # can only be reset when all subpkgs bumped
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Pandoc-style document templates
 
 License:        BSD-3-Clause
@@ -22,11 +23,14 @@ 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/%{doclayout}/%{doclayout}.tar.gz
-Source2:        https://hackage.haskell.org/package/%{errors}/%{errors}.tar.gz
+Source2:        https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz
-Source3:        https://hackage.haskell.org/package/%{textconversions}/%{textconversions}.tar.gz
+Source3:        https://hackage.haskell.org/package/%{errors}/%{errors}.tar.gz
+Source4:        https://hackage.haskell.org/package/%{textconversions}/%{textconversions}.tar.gz
+Source5:        https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal
 # End cabal-rpm sources
 
 # Begin cabal-rpm deps:
+BuildRequires:  dos2unix
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros-extra
 BuildRequires:  ghc-HsYAML-devel
@@ -41,7 +45,6 @@ BuildRequires:  ghc-safe-devel
 BuildRequires:  ghc-scientific-devel
 BuildRequires:  ghc-text-devel
 #BuildRequires:  ghc-text-conversions-devel
-BuildRequires:  ghc-unordered-containers-devel
 BuildRequires:  ghc-vector-devel
 %if %{with ghc_prof}
 BuildRequires:  ghc-HsYAML-prof
@@ -56,14 +59,8 @@ 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
 %endif
-# for missing dep 'doclayout':
-BuildRequires:  ghc-emojis-devel
-%if %{with ghc_prof}
-BuildRequires:  ghc-emojis-prof
-%endif
 # for missing dep 'errors':
 BuildRequires:  ghc-exceptions-devel
 BuildRequires:  ghc-transformers-devel
@@ -129,9 +126,10 @@ This package provides the Haskell %{pkg_name} profiling library.
 %global main_version %{version}
 
 %if %{defined ghclibdir}
-%ghc_lib_subpackage %{doclayout}
+%ghc_lib_subpackage -l BSD-3-Clause %{doclayout}
-%ghc_lib_subpackage %{errors}
+%ghc_lib_subpackage -l BSD-3-Clause %{emojis}
-%ghc_lib_subpackage %{textconversions}
+%ghc_lib_subpackage -l BSD-3-Clause %{errors}
+%ghc_lib_subpackage -l ISC %{textconversions}
 %endif
 
 %global version %{main_version}
@@ -139,8 +137,13 @@ This package provides the Haskell %{pkg_name} profiling library.
 
 %prep
 # Begin cabal-rpm setup:
-%setup -q -n %{pkgver} -a1 -a2 -a3
+%setup -q -n %{pkgver} -a1 -a2 -a3 -a4
+dos2unix -k -n %{SOURCE5} %{pkg_name}.cabal
 # End cabal-rpm setup
+(
+cd %{errors}
+cabal-tweak-dep-ver transformers-compat '< 0.7' '< 0.8'
+)
 
 
 %build
@@ -182,6 +185,10 @@ rm %{buildroot}%{_datadir}/%{doclayout}/{README.md,changelog.md}
 
 
 %changelog
+* Sun Jan 22 2023 Jens Petersen <petersen@redhat.com> - 0.10.0.2-10
+- https://hackage.haskell.org/package/doctemplates-0.10.0.2/changelog
+- refresh to cabal-rpm-2.1.0 with SPDX migration
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

sources

@@ -1,4 +1,5 @@
-SHA512 (doctemplates-0.9.tar.gz) = 3216fc7ef4e2a45230a2854c22c2a8622774bc834bbf59d34134912b3942df2a541230bd91324995e13e19098a0fa0bf7057c7d55ca35ec75da7840fddd61a37
+SHA512 (doctemplates-0.10.0.2.tar.gz) = 47bca3c29cb306ce0dd8cb91c255f2ed1988136380ddbfd3220ca5a14527650b44d2d4f5c7fef3245c5c11e5287dcf2523eb1b0ab861436e7f950fc8188af36a
-SHA512 (doclayout-0.3.1.1.tar.gz) = a3cd5eeef6133121df1a0eedab905aca6de0edcbc7ffb6633efc58e8af5d9c17ed843303c9eeb097aa63f965b36648a967d844daf4e3a103ab75ac4bf42976a5
+SHA512 (doclayout-0.4.tar.gz) = 78d3f64d72c2991bdc9b7ace27ed93e977d3e5fc3afa511857234f1c756fbdb77ccc74ba11af0aabfb09f31a4a906324abc1945160f435c83a07ebd3ae1a44c4
+SHA512 (emojis-0.1.2.tar.gz) = e34d1c1797f37e3cbe37f5f617496aa70310ca654c98069d393c10c5fcf56e336f35d06e018c859354ea54ae1c5fbbe4a24d484a5f59cceb5a9e3c25caf2a52d
 SHA512 (errors-2.3.0.tar.gz) = dddfc63505fd7023c4a669b3cc3d736cf7ecb774b53dcdfeee2d203dcdf4684f5d149a1c217134de214b64af4e154a3ef08b315615c85a1c734ceb42e80823b4
-SHA512 (text-conversions-0.3.1.tar.gz) = 4c0fe08024a56e326b632a67b945fa869a798b00fa45b56f4f181a0075ed5cd6802edec0f0e38c0f4b5cc4b81c6f6bd98e3382b968cec6ad884d24ee31dbf600
+SHA512 (text-conversions-0.3.1.1.tar.gz) = b04fff74f2541120718c377ff820a9e882c3e49e3423f581113ebcf02b13c58b3360be82fdd5e7a039da0077219d9ff64d02ef523b1a16fae89cfab0ac86a4ac