refresh to cabal-rpm-2.1.0 with SPDX migration

.gitignore

@@ -6,3 +6,4 @@
 /sop-core-0.5.0.1.tar.gz
 /generics-sop-0.5.1.1.tar.gz
 /generics-sop-0.5.1.2.tar.gz
+/sop-core-0.5.0.2.tar.gz

generics-sop-0.5.1.2.cabal

@@ -0,0 +1,146 @@
+name:                generics-sop
+version:             0.5.1.2
+x-revision: 1
+synopsis:            Generic Programming using True Sums of Products
+description:
+  A library to support the definition of generic functions.
+  Datatypes are viewed in a uniform, structured way:
+  the choice between constructors is represented using an n-ary
+  sum, and the arguments of each constructor are represented using
+  an n-ary product.
+  .
+  The module "Generics.SOP" is the main module of this library and contains
+  more detailed documentation.
+  .
+  Since version 0.4.0.0, this package is now based on
+  @<https://hackage.haskell.org/package/sop-core sop-core>@. The core package
+  contains all the functionality of n-ary sums and products, whereas this
+  package provides the datatype-generic programming support on top.
+  .
+  Examples of using this library are provided by the following
+  packages:
+  .
+    * @<https://hackage.haskell.org/package/basic-sop basic-sop>@ basic examples,
+  .
+    * @<https://hackage.haskell.org/package/pretty-sop pretty-sop>@ generic pretty printing,
+  .
+    * @<https://hackage.haskell.org/package/lens-sop lens-sop>@ generically computed lenses,
+  .
+    * @<https://hackage.haskell.org/package/json-sop json-sop>@ generic JSON conversions.
+  .
+  A detailed description of the ideas behind this library is provided by
+  the paper:
+  .
+    * Edsko de Vries and Andres Löh.
+      <http://www.andres-loeh.de/TrueSumsOfProducts True Sums of Products>.
+      Workshop on Generic Programming (WGP) 2014.
+  .
+license:             BSD3
+license-file:        LICENSE
+author:              Edsko de Vries <edsko@well-typed.com>, Andres Löh <andres@well-typed.com>
+maintainer:          andres@well-typed.com
+category:            Generics
+build-type:          Simple
+cabal-version:       >=1.10
+extra-source-files:  CHANGELOG.md doctest.sh
+tested-with:         GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.2, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.4, GHC == 9.4.1
+
+source-repository head
+  type:                git
+  location:            https://github.com/well-typed/generics-sop
+
+library
+  exposed-modules:     Generics.SOP
+                       Generics.SOP.GGP
+                       Generics.SOP.TH
+                       Generics.SOP.Type.Metadata
+                       -- exposed via Generics.SOP:
+                       Generics.SOP.Instances
+                       Generics.SOP.Metadata
+                       Generics.SOP.Universe
+                       -- re-exported from Data.SOP:
+                       Generics.SOP.Dict
+                       Generics.SOP.BasicFunctors
+                       Generics.SOP.Classes
+                       Generics.SOP.Constraint
+                       Generics.SOP.NP
+                       Generics.SOP.NS
+                       Generics.SOP.Sing
+  build-depends:       base                 >= 4.9  && < 4.18,
+                       sop-core             == 0.5.0.*,
+                       template-haskell     >= 2.8  && < 2.20,
+                       th-abstraction       >= 0.4  && < 0.5,
+                       ghc-prim             >= 0.3  && < 0.10
+  hs-source-dirs:      src
+  default-language:    Haskell2010
+  ghc-options:         -Wall
+  default-extensions:  CPP
+                       ScopedTypeVariables
+                       TypeFamilies
+                       RankNTypes
+                       TypeOperators
+                       GADTs
+                       ConstraintKinds
+                       MultiParamTypeClasses
+                       TypeSynonymInstances
+                       FlexibleInstances
+                       FlexibleContexts
+                       DeriveFunctor
+                       DeriveFoldable
+                       DeriveTraversable
+                       DefaultSignatures
+                       KindSignatures
+                       DataKinds
+                       FunctionalDependencies
+
+  if impl(ghc <8.2)
+    default-extensions: AutoDeriveTypeable
+
+  -- if impl(ghc >= 8.6)
+  --   default-extensions: NoStarIsType
+  other-extensions:    PolyKinds
+                       UndecidableInstances
+                       TemplateHaskell
+                       StandaloneDeriving
+                       EmptyCase
+                       UndecidableSuperClasses
+
+test-suite generics-sop-examples
+  type:                exitcode-stdio-1.0
+  main-is:             Example.hs
+  other-modules:       HTransExample
+  hs-source-dirs:      test
+  default-language:    Haskell2010
+  ghc-options:         -Wall
+  build-depends:       base                 >= 4.9  && < 5,
+                       generics-sop
+  other-extensions:    DeriveGeneric
+                       EmptyCase
+                       TemplateHaskell
+                       ConstraintKinds
+                       GADTs
+                       DataKinds
+                       TypeFamilies
+                       FlexibleContexts
+                       FlexibleInstances
+                       PolyKinds
+                       DefaultSignatures
+                       FunctionalDependencies
+                       MultiParamTypeClasses
+                       TypeFamilies
+
+benchmark generics-sop-bench
+  type:                exitcode-stdio-1.0
+  main-is:             SOPBench.hs
+  other-modules:       SOPBench.Type
+                       SOPBench.Roundtrip
+                       SOPBench.Eq
+                       SOPBench.Show
+  hs-source-dirs:      bench
+  default-language:    Haskell2010
+  ghc-options:         -Wall
+  build-depends:       base                 >= 4.6  && < 5,
+                       criterion,
+                       deepseq,
+                       generics-sop,
+                       template-haskell

ghc-generics-sop.spec

@@ -1,10 +1,10 @@
-# generated by cabal-rpm-2.0.9 --subpackage
+# generated by cabal-rpm-2.1.0 --subpackage
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
 %global pkg_name generics-sop
 %global pkgver %{pkg_name}-%{version}
 
-%global sopcore sop-core-0.5.0.1
+%global sopcore sop-core-0.5.0.2
 %global subpkgs %{sopcore}
 
 %bcond_without tests
@@ -12,10 +12,10 @@
 Name:           ghc-%{pkg_name}
 Version:        0.5.1.2
 # can only be reset when all subpkgs bumped
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Generic Programming using True Sums of Products
 
-License:        BSD
+License:        BSD-3-Clause
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
@@ -25,12 +25,21 @@ Source1:        https://hackage.haskell.org/package/%{sopcore}/%{sopcore}.tar.gz
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros-extra
+BuildRequires:  ghc-base-devel
+#BuildRequires:  ghc-sop-core-devel
+BuildRequires:  ghc-template-haskell-devel
+BuildRequires:  ghc-th-abstraction-devel
+%if %{with ghc_prof}
 BuildRequires:  ghc-base-prof
 #BuildRequires:  ghc-sop-core-prof
 BuildRequires:  ghc-template-haskell-prof
 BuildRequires:  ghc-th-abstraction-prof
+%endif
 # for missing dep 'sop-core':
+BuildRequires:  ghc-deepseq-devel
+%if %{with ghc_prof}
 BuildRequires:  ghc-deepseq-prof
+%endif
 # End cabal-rpm deps
 
 %description
@@ -129,7 +138,6 @@ This package provides the Haskell %{pkg_name} profiling library.
 # Begin cabal-rpm install
 %ghc_libs_install %{subpkgs}
 %ghc_lib_install
-%ghc_fix_rpath %{pkgver}
 # End cabal-rpm install
 
 
@@ -161,6 +169,10 @@ This package provides the Haskell %{pkg_name} profiling library.
 
 
 %changelog
+* Thu Feb 16 2023 Jens Petersen <petersen@redhat.com> - 0.5.1.2-11
+- refresh to cabal-rpm-2.1.0 with SPDX migration
+- update sop-core to 0.5.0.2
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-SHA512 (sop-core-0.5.0.1.tar.gz) = 2866e7c1a29a5585dabdbd6399e5df4003f21dd94d7b9a1b93681c53e1106af528cfd24dab0b918b36d73d0b05db6525201ea3213ab90575c242557ac41d80bd
 SHA512 (generics-sop-0.5.1.2.tar.gz) = 1a1f61b76cf33b6dc057f095bbeaddda657c1410d1fcab68785e7d016980c581051d616d15d31fed61a12edea9dd244868ec93b996a65825d7fa8d577489509f
+SHA512 (sop-core-0.5.0.2.tar.gz) = bf71bc1823c567bc82c3a5a3166cbb4f4826149d66ec0871d11706512ce823b40ce6ce210cc5ba763a423a8d643b1819237e9b7f0950e901d445e05ccd78597b