From c5c321c9a6f3140f0f542f05346d2699e3066645 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 8 Jun 2020 02:06:42 +0800 Subject: [PATCH] update to 1.8.0 --- .gitignore | 1 + ghc-haddock-library.spec | 28 ++++----- haddock-library-1.8.0.cabal | 116 ++++++++++++++++++++++++++++++++++++ sources | 2 +- 4 files changed, 129 insertions(+), 18 deletions(-) create mode 100644 haddock-library-1.8.0.cabal diff --git a/.gitignore b/.gitignore index 98093aa..6eda9fd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /haddock-library-1.4.5.tar.gz /haddock-library-1.5.0.1.tar.gz /haddock-library-1.7.0.tar.gz +/haddock-library-1.8.0.tar.gz diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index fef7297..e9d906a 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -4,17 +4,16 @@ %global pkg_name haddock-library %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} -Version: 1.7.0 -Release: 2%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: Library exposing some functionality of Haddock 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/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -26,20 +25,14 @@ BuildRequires: ghc-containers-prof BuildRequires: ghc-parsec-prof BuildRequires: ghc-text-prof BuildRequires: ghc-transformers-prof -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-base-compat-devel -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-hspec-devel -%endif # End cabal-rpm deps %description Haddock is a documentation-generation tool for Haskell libraries. These modules expose some functionality of it without pulling in the GHC -dependency. Please note that the API is likely to change so specify upper -bounds in your project. For interacting with Haddock itself, see the [haddock -package](https://hackage.haskell.org/package/haddock). +dependency. Please note that the API is likely to change so be sure to specify +upper bounds in your projects. For interacting with Haddock itself, see the +[haddock package](https://hackage.haskell.org/package/haddock). %package devel @@ -80,6 +73,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -92,13 +86,10 @@ This package provides the Haskell %{pkg_name} profiling library. %install # Begin cabal-rpm install %ghc_lib_install +chmod a-x CHANGES.md # End cabal-rpm install -%check -%cabal_test - - %if 0%{?fedora} < 31 || 0%{?rhel} < 8 %post devel %ghc_pkg_recache @@ -131,6 +122,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sun Jun 07 2020 Jens Petersen - 1.8.0-1 +- update to 1.8.0 + * Tue Jan 28 2020 Fedora Release Engineering - 1.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/haddock-library-1.8.0.cabal b/haddock-library-1.8.0.cabal new file mode 100644 index 0000000..033bbc0 --- /dev/null +++ b/haddock-library-1.8.0.cabal @@ -0,0 +1,116 @@ +cabal-version: 2.2 +name: haddock-library +version: 1.8.0 +x-revision: 1 +synopsis: Library exposing some functionality of Haddock. + +description: Haddock is a documentation-generation tool for Haskell + libraries. These modules expose some + functionality of it without pulling in the GHC + dependency. Please note that the API is likely + to change so be sure to specify upper bounds in + your projects. For interacting with Haddock + itself, see the [haddock package](https://hackage.haskell.org/package/haddock). + +license: BSD-2-Clause +license-files: LICENSE +maintainer: Alec Theriault , Alex Biehl , Simon Hengel , Mateusz Kowalczyk +homepage: http://www.haskell.org/haddock/ +bug-reports: https://github.com/haskell/haddock/issues +category: Documentation +extra-source-files: + CHANGES.md + fixtures/examples/*.input + fixtures/examples/*.parsed + +common lib-defaults + default-language: Haskell2010 + + build-depends: + , base >= 4.7 && < 4.14 + , bytestring ^>= 0.9.2.1 || ^>= 0.10.0.0 + , containers ^>= 0.4.2.1 || ^>= 0.5.0.0 || ^>= 0.6.0.1 + , transformers ^>= 0.3.0.0 || ^>= 0.4.1.0 || ^>= 0.5.0.0 + , text ^>= 1.2.3.0 + , parsec ^>= 3.1.13.0 + + ghc-options: -funbox-strict-fields -Wall -fwarn-tabs + if impl(ghc >= 8.0) + ghc-options: -Wcompat -Wnoncanonical-monad-instances + +library + import: lib-defaults + + hs-source-dirs: src + + exposed-modules: + Documentation.Haddock.Doc + Documentation.Haddock.Markup + Documentation.Haddock.Parser + Documentation.Haddock.Types + + other-modules: + Documentation.Haddock.Parser.Util + Documentation.Haddock.Parser.Monad + Documentation.Haddock.Parser.Identifier + +test-suite spec + import: lib-defaults + type: exitcode-stdio-1.0 + main-is: Spec.hs + hs-source-dirs: + test + src + + cpp-options: + -DTEST + + other-modules: + Documentation.Haddock.Doc + Documentation.Haddock.Markup + Documentation.Haddock.Parser + Documentation.Haddock.Parser.Monad + Documentation.Haddock.Parser.Util + Documentation.Haddock.Parser.UtilSpec + Documentation.Haddock.ParserSpec + Documentation.Haddock.Types + Documentation.Haddock.Parser.Identifier + + build-depends: + , base-compat ^>= 0.9.3 || ^>= 0.11.0 + , QuickCheck ^>= 2.11 || ^>= 2.13.2 + , deepseq ^>= 1.3.0.0 || ^>= 1.4.0.0 + + -- NB: build-depends & build-tool-depends have independent + -- install-plans, so it's best to limit to a single major + -- version of `hspec` & `hspec-discover` to ensure + -- intercompatibility + build-depends: + , hspec >= 2.4.4 && < 2.8 + + build-tool-depends: + , hspec-discover:hspec-discover >= 2.4.4 && < 2.8 + +test-suite fixtures + type: exitcode-stdio-1.0 + default-language: Haskell2010 + main-is: Fixtures.hs + ghc-options: -Wall + hs-source-dirs: fixtures + build-depends: + -- intra-package dependency + , haddock-library + -- constraints inherited via lib:haddock-library component + , base + + -- extra dependencies + , base-compat ^>= 0.9.3 || ^>= 0.11.0 + , directory ^>= 1.3.0.2 + , filepath ^>= 1.4.1.2 + , optparse-applicative ^>= 0.15 + , tree-diff ^>= 0.1 + +source-repository head + type: git + subdir: haddock-library + location: https://github.com/haskell/haddock.git diff --git a/sources b/sources index e5000e5..c4fcd45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (haddock-library-1.7.0.tar.gz) = ae4a3e2e02a866399623349c69b19738b371c574a72b2616f74c9b8fa2acdc04dfb20b7ef6cdd32709b474c0c99d27a49a810b7c58f68d8eb6bea7244323c30c +SHA512 (haddock-library-1.8.0.tar.gz) = f84672b67dd4b18402efb8b40eb0e2cb912ecf894cfdedf61b0ada87392e63609cf1101d4fc793686cc4af354665661bf4dc902313bb466efee683a7c64bbe2b