diff --git a/doclayout-0.4.0.1.tar.gz b/doclayout-0.4.0.1.tar.gz new file mode 100644 index 0000000..1f2e50e --- /dev/null +++ b/doclayout-0.4.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7d3515d41abdfd7a5b69f28bf9520f591881364262698fd49686506b570b30b +size 38465 diff --git a/doclayout-0.4.tar.gz b/doclayout-0.4.tar.gz deleted file mode 100644 index 37d9b28..0000000 --- a/doclayout-0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d2ede4024d1f5e5d918fd799f7e046b03023434e327bc1e1c1402eeb8ffb3a3 -size 38804 diff --git a/doclayout.cabal b/doclayout.cabal deleted file mode 100644 index ffd70fb..0000000 --- a/doclayout.cabal +++ /dev/null @@ -1,71 +0,0 @@ -name: doclayout -version: 0.4 -x-revision: 1 -synopsis: A prettyprinting library for laying out text documents. -description: doclayout is a prettyprinting library for laying out - text documents, with several features not present - in prettyprinting libraries designed for code. It - was designed for use in pandoc. -homepage: https://github.com/jgm/doclayout -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: udhr/txt/*.txt, - udhr/README, - udhr/languages.txt, - src/Text/unicodeWidth.inc -data-files: README.md - changelog.md -cabal-version: >=1.10 - -library - hs-source-dirs: src - exposed-modules: Text.DocLayout - build-depends: base >= 4.12 && < 5, - text, - containers, - emojis >=0.1.2, - mtl, - safe - if !impl(ghc >= 8.0) - build-depends: semigroups == 0.18.* - default-language: Haskell2010 - ghc-options: -Wall -fno-warn-unused-do-bind - -test-suite doclayout-test - type: exitcode-stdio-1.0 - hs-source-dirs: test - main-is: test.hs - build-depends: base, - doclayout, - mtl, - tasty, - tasty-golden, - tasty-hunit, - tasty-quickcheck, - text, - emojis >=0.1.2 - ghc-options: -threaded -rtsopts -with-rtsopts=-N - default-language: Haskell2010 - -benchmark doclayout-bench - Type: exitcode-stdio-1.0 - Main-Is: bench.hs - Hs-Source-Dirs: bench - Build-Depends: doclayout, - base >= 4.8 && < 5, - criterion >= 1.0, - deepseq, - text, - emojis >= 0.1.2, - mtl - Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind - Default-Language: Haskell2010 - -source-repository head - type: git - location: https://github.com/jgm/doclayout diff --git a/ghc-doclayout.changes b/ghc-doclayout.changes index b4308ef..dc4c54b 100644 --- a/ghc-doclayout.changes +++ b/ghc-doclayout.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Mar 30 17:06:38 UTC 2023 - Peter Simons + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + +------------------------------------------------------------------- +Sun Mar 26 04:36:02 UTC 2023 - Peter Simons + +- Update doclayout to version 0.4.0.1. + ## 0.4.0.1 + + * Add clause for Empty to renderList (#22). + * Remove upper bound for criterion + ------------------------------------------------------------------- Sat Aug 13 17:42:11 UTC 2022 - Peter Simons diff --git a/ghc-doclayout.spec b/ghc-doclayout.spec index 0248d07..3e2775f 100644 --- a/ghc-doclayout.spec +++ b/ghc-doclayout.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-doclayout # -# 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 @@ -17,28 +17,39 @@ %global pkg_name doclayout +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.4 +Version: 0.4.0.1 Release: 0 Summary: A prettyprinting library for laying out text documents 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-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-emojis-devel +BuildRequires: ghc-emojis-prof BuildRequires: ghc-mtl-devel +BuildRequires: ghc-mtl-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-safe-devel +BuildRequires: ghc-safe-prof BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof ExcludeArch: %{ix86} %if %{with tests} 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-tasty-quickcheck-devel +BuildRequires: ghc-tasty-quickcheck-prof %endif %description @@ -56,9 +67,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 @@ -83,4 +109,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