Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-yaml for openSUSE:Factory checked in at 2023-04-04 21:25:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old) and /work/SRC/openSUSE:Factory/.ghc-yaml.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-yaml" Tue Apr 4 21:25:06 2023 rev:41 rq:1076140 version:0.11.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes 2023-01-18 13:11:27.396998957 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-yaml.new.19717/ghc-yaml.changes 2023-04-04 21:25:18.498857893 +0200 @@ -1,0 +2,25 @@ +Thu Mar 30 17:09:10 UTC 2023 - Peter Simons <psim...@suse.com> + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + +------------------------------------------------------------------- +Fri Feb 24 05:17:15 UTC 2023 - Peter Simons <psim...@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 <psim...@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) + +------------------------------------------------------------------- Old: ---- yaml-0.11.8.0.tar.gz yaml.cabal New: ---- yaml-0.11.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yaml.spec ++++++ --- /var/tmp/diff_new_pack.baTflP/_old 2023-04-04 21:25:19.426863161 +0200 +++ /var/tmp/diff_new_pack.baTflP/_new 2023-04-04 21:25:19.434863206 +0200 @@ -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 @@ %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 @@ %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.8.0.tar.gz -> yaml-0.11.11.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yaml-0.11.8.0/ChangeLog.md new/yaml-0.11.11.0/ChangeLog.md --- old/yaml-0.11.8.0/ChangeLog.md 2022-02-24 13:18:48.000000000 +0100 +++ new/yaml-0.11.11.0/ChangeLog.md 2023-02-24 03:55:42.000000000 +0100 @@ -1,5 +1,17 @@ # ChangeLog for yaml +## 0.11.11.0 + +* Fix ambiguous occurrence `AesonException` + +## 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) + ## 0.11.8.0 * Export `Parse` and `StringStyle` [#204](https://github.com/snoyberg/yaml/pull/204) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yaml-0.11.8.0/src/Data/Yaml/Internal.hs new/yaml-0.11.11.0/src/Data/Yaml/Internal.hs --- old/yaml-0.11.8.0/src/Data/Yaml/Internal.hs 2022-02-24 13:18:48.000000000 +0100 +++ new/yaml-0.11.11.0/src/Data/Yaml/Internal.hs 2023-02-24 03:55:42.000000000 +0100 @@ -34,7 +34,11 @@ import Control.Monad.Trans.Resource (ResourceT, runResourceT) import Control.Monad.State.Strict import Control.Monad.Reader +#if MIN_VERSION_aeson(2,1,2) +import Data.Aeson hiding (AesonException) +#else import Data.Aeson +#endif #if MIN_VERSION_aeson(2,0,0) import qualified Data.Aeson.Key as K import qualified Data.Aeson.KeyMap as M @@ -51,7 +55,7 @@ import qualified Data.ByteString.Lazy as BL import Data.ByteString.Builder.Scientific (scientificBuilder) import Data.Char (toUpper, ord) -import Data.List +import qualified Data.List as List import Data.Conduit ((.|), ConduitM, runConduit) import qualified Data.Conduit.List as CL import qualified Data.HashSet as HashSet @@ -314,14 +318,14 @@ if s == "<<" then case o of Object l -> return (merge l) - Array l -> return $ merge $ foldl' mergeObjects M.empty $ V.toList l + Array l -> return $ merge $ List.foldl' mergeObjects M.empty $ V.toList l _ -> al else al parseM mergedKeys' a al' where mergeObjects al (Object om) = M.union al om mergeObjects al _ = al - merge xs = (Set.fromList (M.keys xs \\ M.keys front), M.union front xs) + merge xs = (Set.fromList (M.keys xs List.\\ M.keys front), M.union front xs) parseSrc :: ReaderT JSONPath (ConduitM Event Void Parse) val -> ConduitM () Event Parse () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yaml-0.11.8.0/yaml.cabal new/yaml-0.11.11.0/yaml.cabal --- old/yaml-0.11.8.0/yaml.cabal 2022-02-24 13:18:58.000000000 +0100 +++ new/yaml-0.11.11.0/yaml.cabal 2023-02-24 06:17:05.000000000 +0100 @@ -1,11 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.35.1. -- -- see: https://github.com/sol/hpack name: yaml -version: 0.11.8.0 +version: 0.11.11.0 synopsis: Support for parsing and rendering YAML documents. description: README and API documentation are available at <https://www.stackage.org/package/yaml> category: Data @@ -74,7 +74,7 @@ , filepath , libyaml ==0.1.* , mtl - , resourcet >=0.3 && <1.3 + , resourcet >=0.3 && <1.4 , scientific >=0.3 , template-haskell , text @@ -103,20 +103,20 @@ , filepath , libyaml ==0.1.* , mtl - , resourcet >=0.3 && <1.3 + , resourcet >=0.3 && <1.4 , scientific >=0.3 , template-haskell , text , transformers >=0.1 , unordered-containers , vector + default-language: Haskell2010 if flag(no-examples) buildable: False else build-depends: raw-strings-qq , yaml - default-language: Haskell2010 executable json2yaml main-is: json2yaml.hs @@ -138,7 +138,7 @@ , libyaml ==0.1.* , mtl , optparse-applicative - , resourcet >=0.3 && <1.3 + , resourcet >=0.3 && <1.4 , scientific >=0.3 , template-haskell , text @@ -146,9 +146,9 @@ , unordered-containers , vector , yaml + default-language: Haskell2010 if flag(no-exe) buildable: False - default-language: Haskell2010 executable yaml2json main-is: yaml2json.hs @@ -174,7 +174,7 @@ , libyaml ==0.1.* , mtl , optparse-applicative - , resourcet >=0.3 && <1.3 + , resourcet >=0.3 && <1.4 , scientific >=0.3 , template-haskell , text @@ -182,9 +182,9 @@ , unordered-containers , vector , yaml + default-language: Haskell2010 if flag(no-exe) buildable: False - default-language: Haskell2010 test-suite spec type: exitcode-stdio-1.0 @@ -214,7 +214,7 @@ , mockery , mtl , raw-strings-qq - , resourcet >=0.3 && <1.3 + , resourcet >=0.3 && <1.4 , scientific >=0.3 , template-haskell , temporary
