From 51eb3100704b3ee8ba7d14933a2d82553e2dff08c7ebbe118c77de493acdbbbe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:23 +0000 Subject: [PATCH] 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=42 --- ghc-haddock-library.changes | 20 ------ ghc-haddock-library.spec | 8 ++- haddock-library-1.8.0.tar.gz | 3 + haddock-library-1.9.0.tar.gz | 3 - haddock-library.cabal | 116 +++++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 26 deletions(-) create mode 100644 haddock-library-1.8.0.tar.gz delete mode 100644 haddock-library-1.9.0.tar.gz create mode 100644 haddock-library.cabal diff --git a/ghc-haddock-library.changes b/ghc-haddock-library.changes index a3b716a..78ac94f 100644 --- a/ghc-haddock-library.changes +++ b/ghc-haddock-library.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:44:57 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:08 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - -------------------------------------------------------------------- -Wed May 6 06:52:11 UTC 2020 - psimons@suse.com - -- Update haddock-library to version 1.9.0. - ## Changes in version 1.9.0 - - * Fix build-time regression for `base < 4.7` (#1119) - - * Update parsing to strip whitespace from table cells (#1074) - ------------------------------------------------------------------- Mon Dec 23 17:45:40 UTC 2019 - psimons@suse.com diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index c5aed46..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) 2020 SUSE LLC +# 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.9.0 +Version: 1.8.0 Release: 0 Summary: Library exposing some functionality of Haddock 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 @@ -62,7 +63,8 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} +%setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build 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-1.9.0.tar.gz b/haddock-library-1.9.0.tar.gz deleted file mode 100644 index f411f8f..0000000 --- a/haddock-library-1.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac3032d3e2ba87f69c8207b29966e5cda023a30dd25b4d6ae14a93bc2bac6730 -size 31465 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