Convert to %autorelease and %autochangelog

[skip changelog]

22.patch

@@ -0,0 +1,49 @@
+From 33971287445c5e2531d9605a287486dfc3cbe1da Mon Sep 17 00:00:00 2001
+From: mirokuratczyk <miro.kuratczyk@gmail.com>
+Date: Thu, 27 Jan 2022 13:55:24 -0500
+Subject: [PATCH] aeson-2.0.0.0 support
+
+---
+ src/Text/Toml/Types.hs | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/src/Text/Toml/Types.hs b/src/Text/Toml/Types.hs
+index 4027802..06a95f8 100644
+--- a/src/Text/Toml/Types.hs
++++ b/src/Text/Toml/Types.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ {-# LANGUAGE FlexibleInstances #-}
+ {-# LANGUAGE OverloadedStrings #-}
+ 
+@@ -19,6 +20,9 @@ import           Text.Parsec
+ import           Data.Aeson.Types
+ import           Data.HashMap.Strict (HashMap)
+ import qualified Data.HashMap.Strict as M
++#if MIN_VERSION_aeson(2,0,0)
++import qualified Data.Aeson.KeyMap   as KM
++#endif
+ import           Data.Int            (Int64)
+ import           Data.List           (intersect)
+ import           Data.Set (Set)
+@@ -190,9 +194,20 @@ instance (ToBsJSON a) => ToBsJSON (Vector a) where
+ 
+ -- | Provide a 'toBsJSON' instance to the 'NTable'.
+ instance (ToBsJSON v) => ToBsJSON (M.HashMap Text v) where
++#if MIN_VERSION_aeson(2,0,0)
++  toBsJSON = Object . KM.fromHashMapText . M.map toBsJSON
++#else
+   toBsJSON = Object . M.map toBsJSON
++#endif
+   {-# INLINE toBsJSON #-}
+ 
++-- | 'ToBsJSON' instance for 'KeyMap'.
++#if MIN_VERSION_aeson(2,0,0)
++instance (ToBsJSON v) => ToBsJSON (KM.KeyMap v) where
++  toBsJSON = Object . KM.map toBsJSON
++  {-# INLINE toBsJSON #-}
++#endif
++
+ -- | 'ToBsJSON' instances for the 'TValue' type that produce Aeson (JSON)
+ -- in line with BurntSushi's language agnostic TOML test suite.
+ --

changelog

@@ -0,0 +1,60 @@
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0.3-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jun 17 2022 Jens Petersen <petersen@redhat.com> - 1.0.0.3-19
+- rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0.3-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Aug 06 2021 Jens Petersen <petersen@redhat.com> - 1.0.0.3-17
+- rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0.3-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0.3-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0.3-14
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 17 2020 Jens Petersen <petersen@redhat.com> - 1.0.0.3-12
+- refresh to cabal-rpm-2.0.6
+
+* Wed Feb 19 2020 Jens Petersen <petersen@redhat.com> - 1.0.0.3-11
+- refresh to cabal-rpm-2.0.2
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0.3-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Aug 02 2019 Jens Petersen <petersen@redhat.com> - 1.0.0.3-9
+- add doc and prof subpackages (cabal-rpm-1.0.0)
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 1.0.0.3-7
+- refresh to cabal-rpm-0.13
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 28 2018 Jens Petersen <petersen@redhat.com> - 1.0.0.3-5
+- rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan 26 2018 Jens Petersen <petersen@redhat.com> - 1.0.0.3-2
+- rebuild
+
+* Thu Aug  3 2017 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 1.0.0.3-1
+- spec file generated by cabal-rpm-0.11.1

ghc-htoml.spec

@@ -1,24 +1,31 @@
-# generated by cabal-rpm-0.11.1
-# https://fedoraproject.org/wiki/Packaging:Haskell
+# generated by cabal-rpm-2.1.0
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
 %global pkg_name htoml
 %global pkgver %{pkg_name}-%{version}
 
-%bcond_with tests
+# testsuite missing deps: tasty-hspec
 
 Name:           ghc-%{pkg_name}
 Version:        1.0.0.3
-Release:        1%{?dist}
+Release:        %autorelease
 Summary:        Parser for TOML files
 
-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
+Source1:        https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal
+# End cabal-rpm sources
+# https://github.com/cies/htoml/pull/22
+Patch0:         https://patch-diff.githubusercontent.com/raw/cies/htoml/pull/22.patch
 
+# Begin cabal-rpm deps:
+BuildRequires:  dos2unix
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
-# Begin cabal-rpm deps:
 BuildRequires:  ghc-aeson-devel
+BuildRequires:  ghc-base-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-old-locale-devel
 BuildRequires:  ghc-parsec-devel
@@ -26,12 +33,16 @@ BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-time-devel
 BuildRequires:  ghc-unordered-containers-devel
 BuildRequires:  ghc-vector-devel
-%if %{with tests}
-BuildRequires:  ghc-bytestring-devel
-BuildRequires:  ghc-file-embed-devel
-BuildRequires:  ghc-tasty-devel
-BuildRequires:  ghc-tasty-hspec-devel
-BuildRequires:  ghc-tasty-hunit-devel
+%if %{with ghc_prof}
+BuildRequires:  ghc-aeson-prof
+BuildRequires:  ghc-base-prof
+BuildRequires:  ghc-containers-prof
+BuildRequires:  ghc-old-locale-prof
+BuildRequires:  ghc-parsec-prof
+BuildRequires:  ghc-text-prof
+BuildRequires:  ghc-time-prof
+BuildRequires:  ghc-unordered-containers-prof
+BuildRequires:  ghc-vector-prof
 %endif
 # End cabal-rpm deps
 
@@ -45,47 +56,77 @@ a JSON interface using the Aeson library.
 %package devel
 Summary:        Haskell %{pkg_name} library development files
 Provides:       %{name}-static = %{version}-%{release}
+Provides:       %{name}-static%{?_isa} = %{version}-%{release}
+%if %{defined ghc_version}
 Requires:       ghc-compiler = %{ghc_version}
-Requires(post): ghc-compiler = %{ghc_version}
-Requires(postun): ghc-compiler = %{ghc_version}
+%endif
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 This package provides the Haskell %{pkg_name} library development files.
 
 
-%prep
-%setup -q -n %{pkgver}
+%if %{with haddock}
+%package doc
+Summary:        Haskell %{pkg_name} library documentation
+BuildArch:      noarch
+Requires:       ghc-filesystem
 
+%description doc
+This package provides the Haskell %{pkg_name} library documentation.
+%endif
+
+
+%if %{with ghc_prof}
+%package prof
+Summary:        Haskell %{pkg_name} profiling library
+Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
+Supplements:    (%{name}-devel and ghc-prof)
+
+%description prof
+This package provides the Haskell %{pkg_name} profiling library.
+%endif
+
+
+%prep
+# Begin cabal-rpm setup:
+%autosetup -p1 -n %{pkgver}
+dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal
+# End cabal-rpm setup
+cabal-tweak-dep-ver aeson '< 2' '< 2.1'
 
 %build
+# Begin cabal-rpm build:
 %ghc_lib_build
+# End cabal-rpm build
 
 
 %install
+# Begin cabal-rpm install
 %ghc_lib_install
-
-
-%check
-%cabal_test
-
-
-%post devel
-%ghc_pkg_recache
-
-
-%postun devel
-%ghc_pkg_recache
+# End cabal-rpm install
 
 
 %files -f %{name}.files
+# Begin cabal-rpm files:
 %license LICENSE
+# End cabal-rpm files
 
 
 %files devel -f %{name}-devel.files
 %doc CHANGES.md README.md
 
 
+%if %{with haddock}
+%files doc -f %{name}-doc.files
+%license LICENSE
+%endif
+
+
+%if %{with ghc_prof}
+%files prof -f %{name}-prof.files
+%endif
+
+
 %changelog
-* Thu Aug  3 2017 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 1.0.0.3-1
-- spec file generated by cabal-rpm-0.11.1
+%autochangelog

htoml-1.0.0.3.cabal

@@ -0,0 +1,90 @@
+name:                     htoml
+version:                  1.0.0.3
+x-revision: 1
+synopsis:                 Parser for TOML files
+description:              TOML is an obvious and minimal format for config files.
+                          .
+                          This package provides a TOML parser,
+                          build with the Parsec library. It exposes a JSON
+                          interface using the Aeson library.
+homepage:                 https://github.com/cies/htoml
+bug-reports:              https://github.com/cies/htoml/issues
+license:                  BSD3
+license-file:             LICENSE
+copyright:                (c) 2013-2016 Cies Breijs
+author:                   Cies Breijs
+maintainer:               Cies Breijs <cies % kde ! nl>
+category:                 Data, Text, Parser, Configuration, JSON, Language
+build-type:               Simple
+cabal-version:            >= 1.10
+extra-source-files:       README.md
+                        , CHANGES.md
+                        , test/BurntSushi/fetch-toml-tests.sh
+                        , test/BurntSushi/valid/*.toml
+                        , test/BurntSushi/valid/*.json
+                        , test/BurntSushi/invalid/*.toml
+                        , benchmarks/example.toml
+                        , benchmarks/repeated.toml
+
+source-repository head
+  type:                   git
+  location:               https://github.com/cies/htoml.git
+
+library
+  exposed-modules:        Text.Toml
+                        , Text.Toml.Parser
+                        , Text.Toml.Types
+  ghc-options:            -Wall
+  hs-source-dirs:         src
+  default-language:       Haskell2010
+  build-depends:          base                   >= 4.3    && < 5
+                        , parsec                 >= 3.1.2  && < 4
+                        , containers             >= 0.5
+                        , unordered-containers   >= 0.2
+                        , vector                 >= 0.10
+                        , aeson                  >= 0.8    && < 2
+                        , text                   >= 1.0    && < 2
+                        , time                   -any
+                        , old-locale             -any
+
+test-suite htoml-test
+  hs-source-dirs:         test
+  ghc-options:            -Wall -threaded -rtsopts -with-rtsopts=-N
+  main-is:                Test.hs
+  other-modules:          BurntSushi
+                        , Text.Toml.Parser.Spec
+  type:                   exitcode-stdio-1.0
+  default-language:       Haskell2010
+  build-depends:          base
+                        , parsec
+                        , containers
+                        , unordered-containers
+                        , vector
+                        , aeson
+                        , text
+                        , time
+			  -- from here non-lib deps
+                        , htoml
+                        , bytestring
+                        , file-embed
+                        , tasty
+                        , tasty-hspec < 1.2
+                        , tasty-hunit
+
+benchmark benchmarks
+  hs-source-dirs:         benchmarks .
+  ghc-options:            -O2 -Wall -threaded -rtsopts -with-rtsopts=-N
+  main-is:                Benchmarks.hs
+  type:                   exitcode-stdio-1.0
+  default-language:       Haskell2010
+  build-depends:          base
+                        , parsec
+                        , containers
+                        , unordered-containers
+                        , vector
+                        , aeson
+                        , text
+                        , time
+			  -- from here non-lib deps
+                        , htoml
+                        , criterion