Accepting request 1076140 from devel:languages:haskell

update for ghc-9.4.4

OBS-URL: https://build.opensuse.org/request/show/1076140
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc-yaml?expand=0&rev=41

ghc-yaml.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Thu Mar 30 17:09:10 UTC 2023 - Peter Simons <psimons@suse.com>
+
+- Updated spec file to conform with ghc-rpm-macros-2.5.2.
+
+-------------------------------------------------------------------
+Fri Feb 24 05:17:15 UTC 2023 - Peter Simons <psimons@suse.com>
+
+- Update yaml to version 0.11.11.0.
+  ## 0.11.11.0
+
+  * Fix ambiguous occurrence `AesonException`
+
+-------------------------------------------------------------------
+Tue Feb  7 04:04:26 UTC 2023 - Peter Simons <psimons@suse.com>
+
+- Update yaml to version 0.11.10.0.
+  ## 0.11.10.0
+
+  * Undo previous change (breakage with aeson 2)
+
+  ## 0.11.9.0
+
+  * Data.Yaml.Pretty: provide key-sorting function with path to parent object [#206](https://github.com/snoyberg/yaml/pull/206)
+
 -------------------------------------------------------------------
 Mon Oct 24 11:27:18 UTC 2022 - Peter Simons <psimons@suse.com>
 

ghc-yaml.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-yaml
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,41 +17,65 @@
 
 
 %global pkg_name yaml
+%global pkgver %{pkg_name}-%{version}
 %bcond_with tests
 Name:           ghc-%{pkg_name}
-Version:        0.11.8.0
+Version:        0.11.11.0
 Release:        0
 Summary:        Support for parsing and rendering YAML documents
 License:        BSD-3-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/2.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-aeson-devel
+BuildRequires:  ghc-aeson-prof
 BuildRequires:  ghc-attoparsec-devel
+BuildRequires:  ghc-attoparsec-prof
+BuildRequires:  ghc-base-devel
+BuildRequires:  ghc-base-prof
 BuildRequires:  ghc-bytestring-devel
+BuildRequires:  ghc-bytestring-prof
 BuildRequires:  ghc-conduit-devel
+BuildRequires:  ghc-conduit-prof
 BuildRequires:  ghc-containers-devel
+BuildRequires:  ghc-containers-prof
 BuildRequires:  ghc-directory-devel
+BuildRequires:  ghc-directory-prof
 BuildRequires:  ghc-filepath-devel
+BuildRequires:  ghc-filepath-prof
 BuildRequires:  ghc-libyaml-devel
+BuildRequires:  ghc-libyaml-prof
 BuildRequires:  ghc-mtl-devel
+BuildRequires:  ghc-mtl-prof
 BuildRequires:  ghc-resourcet-devel
+BuildRequires:  ghc-resourcet-prof
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-scientific-devel
+BuildRequires:  ghc-scientific-prof
 BuildRequires:  ghc-template-haskell-devel
+BuildRequires:  ghc-template-haskell-prof
 BuildRequires:  ghc-text-devel
+BuildRequires:  ghc-text-prof
 BuildRequires:  ghc-transformers-devel
+BuildRequires:  ghc-transformers-prof
 BuildRequires:  ghc-unordered-containers-devel
+BuildRequires:  ghc-unordered-containers-prof
 BuildRequires:  ghc-vector-devel
+BuildRequires:  ghc-vector-prof
 ExcludeArch:    %{ix86}
 %if %{with tests}
 BuildRequires:  ghc-HUnit-devel
+BuildRequires:  ghc-HUnit-prof
 BuildRequires:  ghc-base-compat-devel
+BuildRequires:  ghc-base-compat-prof
 BuildRequires:  ghc-hspec-devel
+BuildRequires:  ghc-hspec-prof
 BuildRequires:  ghc-mockery-devel
+BuildRequires:  ghc-mockery-prof
 BuildRequires:  ghc-raw-strings-qq-devel
+BuildRequires:  ghc-raw-strings-qq-prof
 BuildRequires:  ghc-temporary-devel
+BuildRequires:  ghc-temporary-prof
 %endif
 
 %description
@@ -68,9 +92,24 @@ Requires(postun): ghc-compiler = %{ghc_version}
 %description devel
 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
 
 %build
 %ghc_lib_build
@@ -93,4 +132,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal
 %files devel -f %{name}-devel.files
 %doc ChangeLog.md README.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

yaml-0.11.11.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c95c00bd2e134cd5c2a9c7032bcadac300fa2b8ed794ac61637a28431580023
+size 31805

yaml-0.11.8.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f61a4e829bb75e17f5da39ea7b9d8d221a100a0f0cb1258bb9584a1829cd0ae8
-size 31674

yaml.cabal

@@ -1,227 +0,0 @@
-cabal-version: 1.12
-
--- This file has been generated from package.yaml by hpack version 0.34.4.
---
--- see: https://github.com/sol/hpack
-
-name:           yaml
-version:        0.11.8.0
-x-revision: 2
-synopsis:       Support for parsing and rendering YAML documents.
-description:    README and API documentation are available at <https://www.stackage.org/package/yaml>
-category:       Data
-stability:      stable
-homepage:       https://github.com/snoyberg/yaml#readme
-bug-reports:    https://github.com/snoyberg/yaml/issues
-author:         Michael Snoyman <michael@snoyman.com>, Anton Ageev <antage@gmail.com>,Kirill Simonov
-maintainer:     Michael Snoyman <michael@snoyman.com>
-license:        BSD3
-license-file:   LICENSE
-build-type:     Simple
-extra-source-files:
-    test/largest-string.yaml
-    test/json.yaml
-    test/resources/foo.yaml
-    test/resources/bar.yaml
-    test/resources/baz.yaml
-    test/resources/accent/foo.yaml
-    test/resources/loop/foo.yaml
-    test/resources/loop/bar.yaml
-    test/resources/empty.yaml
-    test/resources/empty2.yaml
-    README.md
-    ChangeLog.md
-
-source-repository head
-  type: git
-  location: https://github.com/snoyberg/yaml
-
-flag no-examples
-  description: don't build the examples
-  manual: False
-  default: True
-
-flag no-exe
-  description: don't install the yaml2json or json2yaml executables
-  manual: False
-  default: True
-
-library
-  exposed-modules:
-      Data.Yaml
-      Data.Yaml.Aeson
-      Data.Yaml.Builder
-      Data.Yaml.Config
-      Data.Yaml.Include
-      Data.Yaml.Internal
-      Data.Yaml.Parser
-      Data.Yaml.Pretty
-      Data.Yaml.TH
-  other-modules:
-      Paths_yaml
-  hs-source-dirs:
-      src
-  other-extensions:
-      LambdaCase
-  ghc-options: -Wall -Wcompat
-  build-depends:
-      aeson >=0.11
-    , attoparsec >=0.11.3.0
-    , base >=4.9.1 && <5
-    , bytestring >=0.9.1.4
-    , conduit >=1.2.8 && <1.4
-    , containers
-    , directory
-    , filepath
-    , libyaml ==0.1.*
-    , mtl
-    , resourcet >=0.3 && <1.4
-    , scientific >=0.3
-    , template-haskell
-    , text
-    , transformers >=0.1
-    , unordered-containers
-    , vector
-  default-language: Haskell2010
-
-executable examples
-  main-is: Main.hs
-  other-modules:
-      Config
-      Simple
-      Paths_yaml
-  hs-source-dirs:
-      examples
-  ghc-options: -Wall -Wcompat
-  build-depends:
-      aeson >=0.11
-    , attoparsec >=0.11.3.0
-    , base >=4.9.1 && <5
-    , bytestring >=0.9.1.4
-    , conduit >=1.2.8 && <1.4
-    , containers
-    , directory
-    , filepath
-    , libyaml ==0.1.*
-    , mtl
-    , resourcet >=0.3 && <1.4
-    , scientific >=0.3
-    , template-haskell
-    , text
-    , transformers >=0.1
-    , unordered-containers
-    , vector
-  if flag(no-examples)
-    buildable: False
-  else
-    build-depends:
-        raw-strings-qq
-      , yaml
-  default-language: Haskell2010
-
-executable json2yaml
-  main-is: json2yaml.hs
-  other-modules:
-      Common
-      Paths_yaml
-  hs-source-dirs:
-      exe
-  ghc-options: -Wall -Wcompat
-  build-depends:
-      aeson >=0.11
-    , attoparsec >=0.11.3.0
-    , base >=4.9.1 && <5
-    , bytestring >=0.9.1.4
-    , conduit >=1.2.8 && <1.4
-    , containers
-    , directory
-    , filepath
-    , libyaml ==0.1.*
-    , mtl
-    , optparse-applicative
-    , resourcet >=0.3 && <1.4
-    , scientific >=0.3
-    , template-haskell
-    , text
-    , transformers >=0.1
-    , unordered-containers
-    , vector
-    , yaml
-  if flag(no-exe)
-    buildable: False
-  default-language: Haskell2010
-
-executable yaml2json
-  main-is: yaml2json.hs
-  other-modules:
-      Common
-      Paths_yaml
-  hs-source-dirs:
-      exe
-  other-extensions:
-      CPP
-      LambdaCase
-      NamedFieldPuns
-  ghc-options: -Wall -Wcompat
-  build-depends:
-      aeson >=0.11
-    , attoparsec >=0.11.3.0
-    , base >=4.9.1 && <5
-    , bytestring >=0.9.1.4
-    , conduit >=1.2.8 && <1.4
-    , containers
-    , directory
-    , filepath
-    , libyaml ==0.1.*
-    , mtl
-    , optparse-applicative
-    , resourcet >=0.3 && <1.4
-    , scientific >=0.3
-    , template-haskell
-    , text
-    , transformers >=0.1
-    , unordered-containers
-    , vector
-    , yaml
-  if flag(no-exe)
-    buildable: False
-  default-language: Haskell2010
-
-test-suite spec
-  type: exitcode-stdio-1.0
-  main-is: Spec.hs
-  other-modules:
-      Data.Yaml.IncludeSpec
-      Data.Yaml.THSpec
-      Data.YamlSpec
-      Paths_yaml
-  hs-source-dirs:
-      test
-  ghc-options: -Wall -Wcompat -with-rtsopts=-K1K
-  cpp-options: -DTEST
-  build-depends:
-      HUnit
-    , aeson >=0.11
-    , attoparsec >=0.11.3.0
-    , base >=4.9.1 && <5
-    , base-compat
-    , bytestring >=0.9.1.4
-    , conduit >=1.2.8 && <1.4
-    , containers
-    , directory
-    , filepath
-    , hspec >=1.3
-    , libyaml ==0.1.*
-    , mockery
-    , mtl
-    , raw-strings-qq
-    , resourcet >=0.3 && <1.4
-    , scientific >=0.3
-    , template-haskell
-    , temporary
-    , text
-    , transformers >=0.1
-    , unordered-containers
-    , vector
-    , yaml
-  default-language: Haskell2010