From 3d44ba39d9a45904a9895ab25d5d007c2899ebfcf042606819e0554a0c4d5ab5 Mon Sep 17 00:00:00 2001
From: Peter Simons <peter.simons@suse.com>
Date: Tue, 17 Jan 2023 18:08:21 +0000
Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x
 package:ghc-deriving-aeson revision:2, using keep-link

OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-deriving-aeson?expand=0&rev=3
---
 deriving-aeson-0.2.8.tar.gz |  3 ---
 deriving-aeson-0.2.9.tar.gz |  3 +++
 deriving-aeson.cabal        | 37 -------------------------------------
 ghc-deriving-aeson.changes  |  8 ++++++++
 ghc-deriving-aeson.spec     |  6 ++----
 5 files changed, 13 insertions(+), 44 deletions(-)
 delete mode 100644 deriving-aeson-0.2.8.tar.gz
 create mode 100644 deriving-aeson-0.2.9.tar.gz
 delete mode 100644 deriving-aeson.cabal

diff --git a/deriving-aeson-0.2.8.tar.gz b/deriving-aeson-0.2.8.tar.gz
deleted file mode 100644
index 8150217..0000000
--- a/deriving-aeson-0.2.8.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2dd3824fbb182811655e7ff9a2292ffc9178a29d0ccdcc0d04ef74c54856a938
-size 5276
diff --git a/deriving-aeson-0.2.9.tar.gz b/deriving-aeson-0.2.9.tar.gz
new file mode 100644
index 0000000..e7612da
--- /dev/null
+++ b/deriving-aeson-0.2.9.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0b2975df7ed5ba668982ba442318c36adfe8be3c32dcf136c13bf9662261833
+size 5859
diff --git a/deriving-aeson.cabal b/deriving-aeson.cabal
deleted file mode 100644
index 00e537e..0000000
--- a/deriving-aeson.cabal
+++ /dev/null
@@ -1,37 +0,0 @@
-cabal-version:       2.4
-name:                deriving-aeson
-version:             0.2.8
-x-revision: 1
-synopsis:            Type driven generic aeson instance customisation
-description:         This package provides a newtype wrapper with
-  FromJSON/ToJSON instances customisable via a phantom type parameter.
-  The instances can be rendered to the original type using DerivingVia.
-bug-reports:         https://github.com/fumieval/deriving-aeson
-license:             BSD-3-Clause
-license-file:        LICENSE
-author:              Fumiaki Kinoshita
-maintainer:          fumiexcel@gmail.com
-copyright:           Copyright (c) 2020 Fumiaki Kinoshita
-category:            JSON, Generics
-extra-source-files:  CHANGELOG.md, README.md
-tested-with:         GHC == 8.6.5, GHC == 8.8.3, GHC == 8.10.4, GHC == 9.2.1
-
-source-repository head
-  type: git
-  location: https://github.com/fumieval/deriving-aeson.git
-
-library
-  exposed-modules:
-    Deriving.Aeson
-    Deriving.Aeson.Stock
-  build-depends:       base >= 4.12 && <5, aeson >= 1.4.7.0 && <2.2
-  hs-source-dirs: src
-  default-language:    Haskell2010
-  ghc-options: -Wall -Wcompat
-
-test-suite test
-  type: exitcode-stdio-1.0
-  main-is: test.hs
-  build-depends: base, aeson, deriving-aeson, bytestring
-  hs-source-dirs: tests
-  default-language:    Haskell2010
diff --git a/ghc-deriving-aeson.changes b/ghc-deriving-aeson.changes
index 7d17121..e1f660a 100644
--- a/ghc-deriving-aeson.changes
+++ b/ghc-deriving-aeson.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Jan  8 14:38:02 UTC 2023 - Peter Simons <psimons@suse.com>
+
+- Update deriving-aeson to version 0.2.9.
+  ## 0.2.9
+
+  * Fixed a bug in chaining `ConstructorTagModifier` & `FieldLabelModifier`
+
 -------------------------------------------------------------------
 Thu Jun 16 00:50:00 UTC 2022 - Peter Simons <psimons@suse.com>
 
diff --git a/ghc-deriving-aeson.spec b/ghc-deriving-aeson.spec
index 5b5b0dc..554c4e5 100644
--- a/ghc-deriving-aeson.spec
+++ b/ghc-deriving-aeson.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-deriving-aeson
 #
-# 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
@@ -19,13 +19,12 @@
 %global pkg_name deriving-aeson
 %bcond_with tests
 Name:           ghc-%{pkg_name}
-Version:        0.2.8
+Version:        0.2.9
 Release:        0
 Summary:        Type driven generic aeson instance customisation
 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/1.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-rpm-macros
@@ -51,7 +50,6 @@ This package provides the Haskell %{pkg_name} library development files.
 
 %prep
 %autosetup -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
 
 %build
 %ghc_lib_build