From 84b9b41bfe624acacde8d767047d86d4eaa95d4024ec1005146dc3a6727a6430 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2023 13:42:05 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-doctemplates revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-doctemplates?expand=0&rev=51 --- doctemplates-0.10.0.2.tar.gz | 3 -- doctemplates-0.11.tar.gz | 3 ++ doctemplates.cabal | 89 ------------------------------------ ghc-doctemplates.changes | 7 +++ ghc-doctemplates.spec | 5 +- 5 files changed, 11 insertions(+), 96 deletions(-) delete mode 100644 doctemplates-0.10.0.2.tar.gz create mode 100644 doctemplates-0.11.tar.gz delete mode 100644 doctemplates.cabal diff --git a/doctemplates-0.10.0.2.tar.gz b/doctemplates-0.10.0.2.tar.gz deleted file mode 100644 index d25e649..0000000 --- a/doctemplates-0.10.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7749f36083c23ec72fa1a37c1ff72ab9ff470478be23686f80532d209d3402b -size 27788 diff --git a/doctemplates-0.11.tar.gz b/doctemplates-0.11.tar.gz new file mode 100644 index 0000000..b43e84e --- /dev/null +++ b/doctemplates-0.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0080c7f030e98ce6156fd31e77df4c83b8f3ee049beee5006ce923a0169546b +size 25255 diff --git a/doctemplates.cabal b/doctemplates.cabal deleted file mode 100644 index 413e8ef..0000000 --- a/doctemplates.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.changes b/ghc-doctemplates.changes index 953b5a3..64e777a 100644 --- a/ghc-doctemplates.changes +++ b/ghc-doctemplates.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 21 18:35:18 UTC 2022 - Peter Simons + +- Update doctemplates to version 0.11. + Upstream has not updated the file "changelog.md" since the last + release. + ------------------------------------------------------------------- Sat Aug 13 17:48:02 UTC 2022 - Peter Simons diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 9f0ce1c..deacb32 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -19,15 +19,13 @@ %global pkg_name doctemplates %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.10.0.2 +Version: 0.11 Release: 0 Summary: Pandoc-style document templates License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-HsYAML-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-doclayout-devel @@ -68,7 +66,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build From 7dda05e669605791959cfea310abf6ae4e1b24e879f9b50fe56de1fb5e54653d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Feb 2023 09:19:02 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-doctemplates revision:23, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-doctemplates?expand=0&rev=52 --- doctemplates-0.10.0.2.tar.gz | 3 ++ doctemplates-0.11.tar.gz | 3 -- doctemplates.cabal | 89 ++++++++++++++++++++++++++++++++++++ ghc-doctemplates.changes | 7 --- ghc-doctemplates.spec | 5 +- 5 files changed, 96 insertions(+), 11 deletions(-) create mode 100644 doctemplates-0.10.0.2.tar.gz delete mode 100644 doctemplates-0.11.tar.gz create mode 100644 doctemplates.cabal diff --git a/doctemplates-0.10.0.2.tar.gz b/doctemplates-0.10.0.2.tar.gz new file mode 100644 index 0000000..d25e649 --- /dev/null +++ b/doctemplates-0.10.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7749f36083c23ec72fa1a37c1ff72ab9ff470478be23686f80532d209d3402b +size 27788 diff --git a/doctemplates-0.11.tar.gz b/doctemplates-0.11.tar.gz deleted file mode 100644 index b43e84e..0000000 --- a/doctemplates-0.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0080c7f030e98ce6156fd31e77df4c83b8f3ee049beee5006ce923a0169546b -size 25255 diff --git a/doctemplates.cabal b/doctemplates.cabal new file mode 100644 index 0000000..413e8ef --- /dev/null +++ b/doctemplates.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 diff --git a/ghc-doctemplates.changes b/ghc-doctemplates.changes index 64e777a..953b5a3 100644 --- a/ghc-doctemplates.changes +++ b/ghc-doctemplates.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Mon Nov 21 18:35:18 UTC 2022 - Peter Simons - -- Update doctemplates to version 0.11. - Upstream has not updated the file "changelog.md" since the last - release. - ------------------------------------------------------------------- Sat Aug 13 17:48:02 UTC 2022 - Peter Simons diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index deacb32..9f0ce1c 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -19,13 +19,15 @@ %global pkg_name doctemplates %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.11 +Version: 0.10.0.2 Release: 0 Summary: Pandoc-style document templates License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-HsYAML-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-doclayout-devel @@ -66,6 +68,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build From 605e6ddecefa0d753a091a0715a170d928546e12b5d6496cc1403a5b3cfe2001 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 08:26:23 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-doctemplates revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-doctemplates?expand=0&rev=53 --- doctemplates-0.10.0.2.tar.gz | 3 -- doctemplates-0.11.tar.gz | 3 ++ doctemplates.cabal | 89 ------------------------------------ ghc-doctemplates.changes | 7 +++ ghc-doctemplates.spec | 46 +++++++++++++++++-- 5 files changed, 52 insertions(+), 96 deletions(-) delete mode 100644 doctemplates-0.10.0.2.tar.gz create mode 100644 doctemplates-0.11.tar.gz delete mode 100644 doctemplates.cabal diff --git a/doctemplates-0.10.0.2.tar.gz b/doctemplates-0.10.0.2.tar.gz deleted file mode 100644 index d25e649..0000000 --- a/doctemplates-0.10.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7749f36083c23ec72fa1a37c1ff72ab9ff470478be23686f80532d209d3402b -size 27788 diff --git a/doctemplates-0.11.tar.gz b/doctemplates-0.11.tar.gz new file mode 100644 index 0000000..b43e84e --- /dev/null +++ b/doctemplates-0.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0080c7f030e98ce6156fd31e77df4c83b8f3ee049beee5006ce923a0169546b +size 25255 diff --git a/doctemplates.cabal b/doctemplates.cabal deleted file mode 100644 index 413e8ef..0000000 --- a/doctemplates.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.changes b/ghc-doctemplates.changes index 953b5a3..64e777a 100644 --- a/ghc-doctemplates.changes +++ b/ghc-doctemplates.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 21 18:35:18 UTC 2022 - Peter Simons + +- Update doctemplates to version 0.11. + Upstream has not updated the file "changelog.md" since the last + release. + ------------------------------------------------------------------- Sat Aug 13 17:48:02 UTC 2022 - Peter Simons diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 9f0ce1c..9e43655 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -17,37 +17,55 @@ %global pkg_name doctemplates +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.10.0.2 +Version: 0.11 Release: 0 Summary: Pandoc-style document templates License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-HsYAML-devel BuildRequires: ghc-aeson-devel +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-doclayout-devel +BuildRequires: ghc-doclayout-prof BuildRequires: ghc-filepath-devel +BuildRequires: ghc-filepath-prof BuildRequires: ghc-mtl-devel +BuildRequires: ghc-mtl-prof BuildRequires: ghc-parsec-devel +BuildRequires: ghc-parsec-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-safe-devel +BuildRequires: ghc-safe-prof BuildRequires: ghc-scientific-devel +BuildRequires: ghc-scientific-prof BuildRequires: ghc-text-conversions-devel +BuildRequires: ghc-text-conversions-prof BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof BuildRequires: ghc-vector-devel +BuildRequires: ghc-vector-prof ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-Glob-devel +BuildRequires: ghc-Glob-prof BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-bytestring-prof BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-golden-devel +BuildRequires: ghc-tasty-golden-prof BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-hunit-prof +BuildRequires: ghc-tasty-prof BuildRequires: ghc-temporary-devel +BuildRequires: ghc-temporary-prof %endif %description @@ -66,9 +84,24 @@ Requires(postun): ghc-compiler = %{ghc_version} %description devel This package provides the Haskell %{pkg_name} library development files. +%package -n ghc-%{pkg_name}-doc +Summary: Haskell %{pkg_name} library documentation +Requires: ghc-filesystem +BuildArch: noarch + +%description -n ghc-%{pkg_name}-doc +This package provides the Haskell %{pkg_name} library documentation. + +%package -n ghc-%{pkg_name}-prof +Summary: Haskell %{pkg_name} profiling library +Requires: ghc-%{pkg_name}-devel = %{version}-%{release} +Supplements: (ghc-%{pkg_name}-devel and ghc-prof) + +%description -n ghc-%{pkg_name}-prof +This package provides the Haskell %{pkg_name} profiling library. + %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -93,4 +126,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files +%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files +%license LICENSE + +%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files + %changelog From 1daafb751f447d5260a512809d25828c81869bc7a5855ae09d0e340b83137f97 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 17:38:37 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-doctemplates revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-doctemplates?expand=0&rev=54 --- ghc-doctemplates.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-doctemplates.changes b/ghc-doctemplates.changes index 64e777a..17f0f72 100644 --- a/ghc-doctemplates.changes +++ b/ghc-doctemplates.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 30 17:06:39 UTC 2023 - Peter Simons + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + ------------------------------------------------------------------- Mon Nov 21 18:35:18 UTC 2022 - Peter Simons From 7514091fdbe6f57ffa6b3df21d89c6e2e284785e6caaea0bf3f73ff1a354fe0f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 17:51:37 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-doctemplates revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-doctemplates?expand=0&rev=55 --- ghc-doctemplates.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 9e43655..b123de7 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-doctemplates # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed