From 89cea49909f93e50c17dcee244fc5ae57969dc5e8736e9b0723c2942982cd00a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Oct 2019 01:03:36 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-haddock-library revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-haddock-library?expand=0&rev=30 --- ghc-haddock-library.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 2e5cd7f..9662858 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -23,7 +23,6 @@ Version: 1.7.0 Release: 0 Summary: Library exposing some functionality of Haddock License: BSD-3-Clause -Group: Development/Libraries/Haskell URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel @@ -49,7 +48,6 @@ package](https://hackage.haskell.org/package/haddock). %package devel Summary: Haskell %{pkg_name} library development files -Group: Development/Libraries/Haskell Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} From 8fc0a5d17a578c5a6d2c3c6f95bdd7139ca0d1172455ce9c95f25eab4302f80e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Dec 2019 02:02:46 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-haddock-library revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-haddock-library?expand=0&rev=31 --- ghc-haddock-library.changes | 16 +++++ ghc-haddock-library.spec | 18 ++++-- haddock-library-1.7.0.tar.gz | 3 - haddock-library-1.8.0.tar.gz | 3 + haddock-library.cabal | 116 +++++++++++++++++++++++++++++++++++ 5 files changed, 147 insertions(+), 9 deletions(-) delete mode 100644 haddock-library-1.7.0.tar.gz create mode 100644 haddock-library-1.8.0.tar.gz create mode 100644 haddock-library.cabal diff --git a/ghc-haddock-library.changes b/ghc-haddock-library.changes index 39bfd55..78ac94f 100644 --- a/ghc-haddock-library.changes +++ b/ghc-haddock-library.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Dec 23 17:45:40 UTC 2019 - psimons@suse.com + +- Update haddock-library to version 1.8.0. + ## Changes in version 1.8.0 + + * Support inline markup in markdown-style links (#875) + + * Remove now unused `Documentation.Haddock.Utf8` module. + This module was anyways copied from the `utf8-string` package. + +------------------------------------------------------------------- +Fri Nov 8 16:13:49 UTC 2019 - Peter Simons + +- Drop obsolete group attributes. + ------------------------------------------------------------------- Wed Oct 17 02:01:32 UTC 2018 - psimons@suse.com diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 9662858..d2a6dcd 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-haddock-library # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,13 @@ %global pkg_name haddock-library %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.7.0 +Version: 1.8.0 Release: 0 Summary: Library exposing some functionality of Haddock -License: BSD-3-Clause +License: BSD-2-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-bytestring-devel BuildRequires: ghc-containers-devel @@ -36,15 +37,19 @@ BuildRequires: ghc-transformers-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-base-compat-devel BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-filepath-devel BuildRequires: ghc-hspec-devel +BuildRequires: ghc-optparse-applicative-devel +BuildRequires: ghc-tree-diff-devel %endif %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 Summary: Haskell %{pkg_name} library development files @@ -59,6 +64,7 @@ files. %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/haddock-library-1.7.0.tar.gz b/haddock-library-1.7.0.tar.gz deleted file mode 100644 index 59a2507..0000000 --- a/haddock-library-1.7.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7c2794a7eb352824f098cafa07bc0506f2c3633808bfbf4c64aef0ba664d011 -size 26315 diff --git a/haddock-library-1.8.0.tar.gz b/haddock-library-1.8.0.tar.gz new file mode 100644 index 0000000..af74667 --- /dev/null +++ b/haddock-library-1.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7093a70308a548c1fa46c01fe236bc27125311159ad797304e6b0ee893d8b797 +size 30918 diff --git a/haddock-library.cabal b/haddock-library.cabal new file mode 100644 index 0000000..6ccdd48 --- /dev/null +++ b/haddock-library.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