From a1b717dfb4cac1b0a5c23ad3287507e181415a92e805a27c91bc1206dce0638c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2020 01:01:26 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-HsYAML-aeson revision:16, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-HsYAML-aeson?expand=0&rev=15 --- ghc-HsYAML-aeson.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ghc-HsYAML-aeson.changes b/ghc-HsYAML-aeson.changes index ff797b3..587bf9c 100644 --- a/ghc-HsYAML-aeson.changes +++ b/ghc-HsYAML-aeson.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 31 09:34:35 UTC 2020 - psimons@suse.com + +- Update HsYAML-aeson to version 0.2.0.0 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Tue Aug 18 10:43:48 UTC 2020 - Peter Simons From 34861fdb631bb2fc26696a9e3d21786c91fc206bd5f1309ee098752057e26d9d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:02:53 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-HsYAML-aeson revision:2, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-HsYAML-aeson?expand=0&rev=16 --- HsYAML-aeson.cabal | 48 ---------------------------------------- ghc-HsYAML-aeson.changes | 21 ------------------ ghc-HsYAML-aeson.spec | 8 +++---- 3 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 HsYAML-aeson.cabal diff --git a/HsYAML-aeson.cabal b/HsYAML-aeson.cabal deleted file mode 100644 index ae1782a..0000000 --- a/HsYAML-aeson.cabal +++ /dev/null @@ -1,48 +0,0 @@ -cabal-version: 2.2 -name: HsYAML-aeson -version: 0.2.0.0 -x-revision: 2 -license: GPL-2.0-or-later -license-file: LICENSE.GPLv2 -author: Herbert Valerio Riedel -maintainer: hvr@gnu.org -copyright: 2018-2019 Herbert Valerio Riedel -category: Text, Codec, Web, JSON, YAML -synopsis: JSON to YAML Adapter -description: - The [YAML 1.2](https://yaml.org/spec/1.2/spec.html) format provides - a much richer data-model and feature-set - than the [JavaScript Object Notation (JSON)](https://tools.ietf.org/html/rfc7159) format. - However, sometimes it's desirable to ignore the extra capabilities - and treat YAML as if it was merely a more convenient markup format - for humans to write JSON data. To this end this module provides a - compatibility layer atop [HsYAML](https://hackage.haskell.org/package/HsYAML) - which allows decoding YAML documents in the more limited JSON data-model while also providing - convenience by reusing [aeson](https://hackage.haskell.org/package/aeson)'s - 'FromJSON' instances for decoding the YAML data into native Haskell data types. - -extra-source-files: - CHANGELOG.md - -source-repository head - type: git - location: https://github.com/hvr/HsYAML-aeson.git - -library - exposed-modules: Data.YAML.Aeson - build-depends: - , HsYAML ^>= 0.2.0 - , aeson >= 1.4.0.0 && < 1.6 - , base >= 4.5 && < 4.15 - , bytestring ^>= 0.9.2.1 || ^>= 0.10.0.2 - , containers >=0.4.2 && <0.7 - , mtl ^>= 2.2.1 - , scientific ^>= 0.3.6.2 - , text ^>= 1.2.3 - , unordered-containers ^>= 0.2 - , vector ^>= 0.12.0.2 - - hs-source-dirs: src - default-language: Haskell2010 - other-extensions: RecordWildCards Trustworthy - ghc-options: -Wall diff --git a/ghc-HsYAML-aeson.changes b/ghc-HsYAML-aeson.changes index 587bf9c..a86c5b3 100644 --- a/ghc-HsYAML-aeson.changes +++ b/ghc-HsYAML-aeson.changes @@ -1,24 +1,3 @@ -------------------------------------------------------------------- -Mon Aug 31 09:34:35 UTC 2020 - psimons@suse.com - -- Update HsYAML-aeson to version 0.2.0.0 revision 2. - Upstream has revised the Cabal build instructions on Hackage. - -------------------------------------------------------------------- -Tue Aug 18 10:43:48 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:13:37 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - -------------------------------------------------------------------- -Thu May 7 08:08:21 UTC 2020 - Peter Simons - -- Update Cabal file to get more accurate dependency information. - ------------------------------------------------------------------- Mon Dec 23 21:16:05 UTC 2019 - psimons@suse.com diff --git a/ghc-HsYAML-aeson.spec b/ghc-HsYAML-aeson.spec index 0adb8ae..6c1e11c 100644 --- a/ghc-HsYAML-aeson.spec +++ b/ghc-HsYAML-aeson.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-HsYAML-aeson # -# 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 @@ -24,7 +24,6 @@ Summary: JSON to YAML Adapter License: GPL-2.0-or-later 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-HsYAML-devel BuildRequires: ghc-aeson-devel @@ -60,8 +59,9 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal +%setup -q -n %{pkg_name}-%{version} +echo > Setup.hs 'import Distribution.Simple' +echo >>Setup.hs 'main = defaultMain' %build %ghc_lib_build From aa27d753ffeb5367490cf89967977871f314b85b4fa110ab3db1e3cb413d4e98 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:09:53 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-HsYAML-aeson revision:16, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-HsYAML-aeson?expand=0&rev=18 --- HsYAML-aeson.cabal | 48 ++++++++++++++++++++++++++++++++++++++++ ghc-HsYAML-aeson.changes | 21 ++++++++++++++++++ ghc-HsYAML-aeson.spec | 8 +++---- 3 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 HsYAML-aeson.cabal diff --git a/HsYAML-aeson.cabal b/HsYAML-aeson.cabal new file mode 100644 index 0000000..ae1782a --- /dev/null +++ b/HsYAML-aeson.cabal @@ -0,0 +1,48 @@ +cabal-version: 2.2 +name: HsYAML-aeson +version: 0.2.0.0 +x-revision: 2 +license: GPL-2.0-or-later +license-file: LICENSE.GPLv2 +author: Herbert Valerio Riedel +maintainer: hvr@gnu.org +copyright: 2018-2019 Herbert Valerio Riedel +category: Text, Codec, Web, JSON, YAML +synopsis: JSON to YAML Adapter +description: + The [YAML 1.2](https://yaml.org/spec/1.2/spec.html) format provides + a much richer data-model and feature-set + than the [JavaScript Object Notation (JSON)](https://tools.ietf.org/html/rfc7159) format. + However, sometimes it's desirable to ignore the extra capabilities + and treat YAML as if it was merely a more convenient markup format + for humans to write JSON data. To this end this module provides a + compatibility layer atop [HsYAML](https://hackage.haskell.org/package/HsYAML) + which allows decoding YAML documents in the more limited JSON data-model while also providing + convenience by reusing [aeson](https://hackage.haskell.org/package/aeson)'s + 'FromJSON' instances for decoding the YAML data into native Haskell data types. + +extra-source-files: + CHANGELOG.md + +source-repository head + type: git + location: https://github.com/hvr/HsYAML-aeson.git + +library + exposed-modules: Data.YAML.Aeson + build-depends: + , HsYAML ^>= 0.2.0 + , aeson >= 1.4.0.0 && < 1.6 + , base >= 4.5 && < 4.15 + , bytestring ^>= 0.9.2.1 || ^>= 0.10.0.2 + , containers >=0.4.2 && <0.7 + , mtl ^>= 2.2.1 + , scientific ^>= 0.3.6.2 + , text ^>= 1.2.3 + , unordered-containers ^>= 0.2 + , vector ^>= 0.12.0.2 + + hs-source-dirs: src + default-language: Haskell2010 + other-extensions: RecordWildCards Trustworthy + ghc-options: -Wall diff --git a/ghc-HsYAML-aeson.changes b/ghc-HsYAML-aeson.changes index a86c5b3..587bf9c 100644 --- a/ghc-HsYAML-aeson.changes +++ b/ghc-HsYAML-aeson.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon Aug 31 09:34:35 UTC 2020 - psimons@suse.com + +- Update HsYAML-aeson to version 0.2.0.0 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Tue Aug 18 10:43:48 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:13:37 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +------------------------------------------------------------------- +Thu May 7 08:08:21 UTC 2020 - Peter Simons + +- Update Cabal file to get more accurate dependency information. + ------------------------------------------------------------------- Mon Dec 23 21:16:05 UTC 2019 - psimons@suse.com diff --git a/ghc-HsYAML-aeson.spec b/ghc-HsYAML-aeson.spec index 6c1e11c..0adb8ae 100644 --- a/ghc-HsYAML-aeson.spec +++ b/ghc-HsYAML-aeson.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-HsYAML-aeson # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ Summary: JSON to YAML Adapter License: GPL-2.0-or-later 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-HsYAML-devel BuildRequires: ghc-aeson-devel @@ -59,9 +60,8 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} -echo > Setup.hs 'import Distribution.Simple' -echo >>Setup.hs 'main = defaultMain' +%autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build