From 6c3da42bcefda208e523774a32b3b2c826cf281e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 24 Jul 2023 00:06:18 +0800 Subject: [PATCH] update to 0.11 --- .gitignore | 2 + doctemplates-0.10.0.2.cabal | 89 ------------------------------------- ghc-doctemplates.spec | 17 ++++--- sources | 4 +- 4 files changed, 12 insertions(+), 100 deletions(-) delete mode 100644 doctemplates-0.10.0.2.cabal diff --git a/.gitignore b/.gitignore index 3c1e765..576d71a 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /emojis-0.1.2.tar.gz /doclayout-0.4.tar.gz /text-conversions-0.3.1.1.tar.gz +/doctemplates-0.11.tar.gz +/doclayout-0.4.0.1.tar.gz diff --git a/doctemplates-0.10.0.2.cabal b/doctemplates-0.10.0.2.cabal deleted file mode 100644 index 548d6ed..0000000 --- a/doctemplates-0.10.0.2.cabal +++ /dev/null @@ -1,89 +0,0 @@ -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 diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index eccc125..2553348 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -1,10 +1,10 @@ -# generated by cabal-rpm-2.1.0 --subpackage +# generated by cabal-rpm-2.1.2 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name doctemplates %global pkgver %{pkg_name}-%{version} -%global doclayout doclayout-0.4 +%global doclayout doclayout-0.4.0.1 %global emojis emojis-0.1.2 %global errors errors-2.3.0 %global textconversions text-conversions-0.3.1.1 @@ -13,9 +13,9 @@ # testsuite missing deps: tasty-golden Name: ghc-%{pkg_name} -Version: 0.10.0.2 +Version: 0.11 # can only be reset when all subpkgs bumped -Release: 11%{?dist} +Release: 12%{?dist} Summary: Pandoc-style document templates License: BSD-3-Clause @@ -26,14 +26,11 @@ Source1: https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.ta Source2: https://hackage.haskell.org/package/%{emojis}/%{emojis}.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 BuildRequires: ghc-aeson-devel BuildRequires: ghc-base-devel BuildRequires: ghc-containers-devel @@ -47,7 +44,6 @@ BuildRequires: ghc-text-devel #BuildRequires: ghc-text-conversions-devel BuildRequires: ghc-vector-devel %if %{with ghc_prof} -BuildRequires: ghc-HsYAML-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-base-prof BuildRequires: ghc-containers-prof @@ -138,10 +134,10 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %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 text '< 1.3' '< 2.2' cabal-tweak-dep-ver transformers-compat '< 0.7' '< 0.8' ) @@ -185,6 +181,9 @@ rm %{buildroot}%{_datadir}/%{doclayout}/{README.md,changelog.md} %changelog +* Sun Jul 23 2023 Jens Petersen - 0.11-12 +- https://hackage.haskell.org/package/doctemplates-0.11/changelog + * Wed Jul 19 2023 Fedora Release Engineering - 0.10.0.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index f8b8b2a..0fd0112 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (doctemplates-0.10.0.2.tar.gz) = 47bca3c29cb306ce0dd8cb91c255f2ed1988136380ddbfd3220ca5a14527650b44d2d4f5c7fef3245c5c11e5287dcf2523eb1b0ab861436e7f950fc8188af36a -SHA512 (doclayout-0.4.tar.gz) = 78d3f64d72c2991bdc9b7ace27ed93e977d3e5fc3afa511857234f1c756fbdb77ccc74ba11af0aabfb09f31a4a906324abc1945160f435c83a07ebd3ae1a44c4 +SHA512 (doctemplates-0.11.tar.gz) = f6e99c7fdc1c2ce4bdac3ff7bd92ad032d9d545f45300bdea46ca09518942adf6ba9b23b002f145d7f4841e119248dc51f61a99949816f7093fb15dddf441433 +SHA512 (doclayout-0.4.0.1.tar.gz) = 7af503194e513b4586442e850959a247cada1a375964e458cdf8f1df7ecb35f0c350eba3bf55c904107c89f7cc584ea957f218930f41229df62a9528ace4aab2 SHA512 (emojis-0.1.2.tar.gz) = e34d1c1797f37e3cbe37f5f617496aa70310ca654c98069d393c10c5fcf56e336f35d06e018c859354ea54ae1c5fbbe4a24d484a5f59cceb5a9e3c25caf2a52d SHA512 (errors-2.3.0.tar.gz) = dddfc63505fd7023c4a669b3cc3d736cf7ecb774b53dcdfeee2d203dcdf4684f5d149a1c217134de214b64af4e154a3ef08b315615c85a1c734ceb42e80823b4 SHA512 (text-conversions-0.3.1.1.tar.gz) = b04fff74f2541120718c377ff820a9e882c3e49e3423f581113ebcf02b13c58b3360be82fdd5e7a039da0077219d9ff64d02ef523b1a16fae89cfab0ac86a4ac