diff --git a/ghc-haddock-library.changes b/ghc-haddock-library.changes index 351aedb..f85b021 100644 --- a/ghc-haddock-library.changes +++ b/ghc-haddock-library.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Sat Sep 24 14:14:21 UTC 2022 - Peter Simons - -- Update haddock-library to version 1.11.0 revision 1. - Upstream has edited the change log file since the last release in - a non-trivial way, i.e. they did more than just add a new entry - at the top. You can review the file at: - http://hackage.haskell.org/package/haddock-library-1.11.0/src/CHANGES.md - ------------------------------------------------------------------- Thu Mar 3 19:26:44 UTC 2022 - Peter Simons diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index a0d5c2c..13ed625 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -19,18 +19,20 @@ %global pkg_name haddock-library %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.11.0 +Version: 1.10.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 +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/3.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel +BuildRequires: ghc-transformers-devel ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel diff --git a/haddock-library-1.10.0.tar.gz b/haddock-library-1.10.0.tar.gz new file mode 100644 index 0000000..ebc12a9 --- /dev/null +++ b/haddock-library-1.10.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f806c7d5a07d63166101332664c345278f88a5781a640ec3ef215c8fb0015395 +size 32427 diff --git a/haddock-library-1.11.0.tar.gz b/haddock-library-1.11.0.tar.gz deleted file mode 100644 index 8a52173..0000000 --- a/haddock-library-1.11.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c075ec9a378b0a2d9d605e72135201e6c7ff316564f2c974113582f43bea20a -size 32833 diff --git a/haddock-library.cabal b/haddock-library.cabal index 621d65a..ad72be5 100644 --- a/haddock-library.cabal +++ b/haddock-library.cabal @@ -1,7 +1,7 @@ -cabal-version: 3.0 +cabal-version: 2.2 name: haddock-library -version: 1.11.0 -x-revision: 1 +version: 1.10.0 +x-revision: 3 synopsis: Library exposing some functionality of Haddock. description: Haddock is a documentation-generation tool for Haskell @@ -29,7 +29,6 @@ tested-with: GHC == 7.4.2 , GHC == 8.8.3 , GHC == 8.10.1 , GHC == 9.0.1 - , GHC == 9.2.0 extra-source-files: CHANGES.md @@ -40,8 +39,10 @@ common lib-defaults default-language: Haskell2010 build-depends: - , base >= 4.5 && < 4.18 + , base >= 4.5 && < 4.17 + , bytestring , containers ^>= 0.4.2.1 || ^>= 0.5.0.0 || ^>= 0.6.0.1 + , transformers , text ^>= 1.2.3.0 || ^>= 2.0 , parsec ^>= 3.1.13.0 @@ -87,7 +88,7 @@ test-suite spec Documentation.Haddock.Parser.Identifier build-depends: - , base-compat ^>= 0.12.0 + , base-compat ^>= 0.9.3 || ^>= 0.11.0 , QuickCheck ^>= 2.11 || ^>= 2.13.2 || ^>= 2.14 , deepseq ^>= 1.3.0.0 || ^>= 1.4.0.0 @@ -96,10 +97,10 @@ test-suite spec -- version of `hspec` & `hspec-discover` to ensure -- intercompatibility build-depends: - , hspec >= 2.4.4 && < 2.10 + , hspec >= 2.4.4 && < 2.8 build-tool-depends: - , hspec-discover:hspec-discover >= 2.4.4 && < 2.10 + , hspec-discover:hspec-discover >= 2.4.4 && < 2.8 test-suite fixtures type: exitcode-stdio-1.0 @@ -114,11 +115,11 @@ test-suite fixtures , base -- extra dependencies - , base-compat ^>= 0.12.0 + , 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.2 + , tree-diff ^>= 0.1 source-repository head type: git