From 2e0c3e0dc7bde9c9d159e62541208ad48929126e634c1533e4a1aace17fdd2c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 08:26:24 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-haddock-library revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-haddock-library?expand=0&rev=57 --- ghc-haddock-library.changes | 9 ++++++++ ghc-haddock-library.spec | 41 +++++++++++++++++++++++++++++++---- haddock-library-1.10.0.tar.gz | 3 --- haddock-library-1.11.0.tar.gz | 3 +++ haddock-library.cabal | 21 +++++++++--------- 5 files changed, 59 insertions(+), 18 deletions(-) delete mode 100644 haddock-library-1.10.0.tar.gz create mode 100644 haddock-library-1.11.0.tar.gz diff --git a/ghc-haddock-library.changes b/ghc-haddock-library.changes index f85b021..351aedb 100644 --- a/ghc-haddock-library.changes +++ b/ghc-haddock-library.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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 13ed625..a75fb83 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -17,32 +17,44 @@ %global pkg_name haddock-library +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.10.0 +Version: 1.11.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/3.cabal#/%{pkg_name}.cabal +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-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-parsec-devel +BuildRequires: ghc-parsec-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel -BuildRequires: ghc-transformers-devel +BuildRequires: ghc-text-prof ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-QuickCheck-prof BuildRequires: ghc-base-compat-devel +BuildRequires: ghc-base-compat-prof BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-deepseq-prof BuildRequires: ghc-directory-devel +BuildRequires: ghc-directory-prof BuildRequires: ghc-filepath-devel +BuildRequires: ghc-filepath-prof BuildRequires: ghc-hspec-devel +BuildRequires: ghc-hspec-prof BuildRequires: ghc-optparse-applicative-devel +BuildRequires: ghc-optparse-applicative-prof BuildRequires: ghc-tree-diff-devel +BuildRequires: ghc-tree-diff-prof %endif %description @@ -63,6 +75,22 @@ Requires(postun): ghc-compiler = %{ghc_version} 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 @@ -88,4 +116,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %doc CHANGES.md +%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 diff --git a/haddock-library-1.10.0.tar.gz b/haddock-library-1.10.0.tar.gz deleted file mode 100644 index ebc12a9..0000000 --- a/haddock-library-1.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 new file mode 100644 index 0000000..8a52173 --- /dev/null +++ b/haddock-library-1.11.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c075ec9a378b0a2d9d605e72135201e6c7ff316564f2c974113582f43bea20a +size 32833 diff --git a/haddock-library.cabal b/haddock-library.cabal index ad72be5..621d65a 100644 --- a/haddock-library.cabal +++ b/haddock-library.cabal @@ -1,7 +1,7 @@ -cabal-version: 2.2 +cabal-version: 3.0 name: haddock-library -version: 1.10.0 -x-revision: 3 +version: 1.11.0 +x-revision: 1 synopsis: Library exposing some functionality of Haddock. description: Haddock is a documentation-generation tool for Haskell @@ -29,6 +29,7 @@ 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 @@ -39,10 +40,8 @@ common lib-defaults default-language: Haskell2010 build-depends: - , base >= 4.5 && < 4.17 - , bytestring + , base >= 4.5 && < 4.18 , 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 @@ -88,7 +87,7 @@ test-suite spec Documentation.Haddock.Parser.Identifier build-depends: - , base-compat ^>= 0.9.3 || ^>= 0.11.0 + , base-compat ^>= 0.12.0 , QuickCheck ^>= 2.11 || ^>= 2.13.2 || ^>= 2.14 , deepseq ^>= 1.3.0.0 || ^>= 1.4.0.0 @@ -97,10 +96,10 @@ test-suite spec -- version of `hspec` & `hspec-discover` to ensure -- intercompatibility build-depends: - , hspec >= 2.4.4 && < 2.8 + , hspec >= 2.4.4 && < 2.10 build-tool-depends: - , hspec-discover:hspec-discover >= 2.4.4 && < 2.8 + , hspec-discover:hspec-discover >= 2.4.4 && < 2.10 test-suite fixtures type: exitcode-stdio-1.0 @@ -115,11 +114,11 @@ test-suite fixtures , base -- extra dependencies - , base-compat ^>= 0.9.3 || ^>= 0.11.0 + , base-compat ^>= 0.12.0 , directory ^>= 1.3.0.2 , filepath ^>= 1.4.1.2 , optparse-applicative ^>= 0.15 - , tree-diff ^>= 0.1 + , tree-diff ^>= 0.2 source-repository head type: git