Convert to %autorelease and %autochangelog

[skip changelog]

.gitignore

@@ -5,3 +5,7 @@
 /cabal-doctest-1.0.4.tar.gz
 /distributive-0.5.3.tar.gz
 /cabal-doctest-1.0.6.tar.gz
+/distributive-0.6.tar.gz
+/distributive-0.6.1.tar.gz
+/distributive-0.6.2.tar.gz
+/distributive-0.6.2.1.tar.gz

changelog

@@ -0,0 +1,93 @@
+* Thu Feb 16 2023 Jens Petersen <petersen@redhat.com> - 0.6.2.1-5
+- refresh to cabal-rpm-2.1.0 with SPDX migration
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jun 17 2022 Jens Petersen <petersen@redhat.com> - 0.6.2.1-3
+- rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Aug  5 2021 Jens Petersen <petersen@redhat.com> - 0.6.2.1-1
+- update to 0.6.2.1
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Jun 07 2020 Jens Petersen <petersen@redhat.com> - 0.6.2-1
+- update to 0.6.2
+
+* Fri Feb 14 2020 Jens Petersen <petersen@redhat.com> - 0.6.1-1
+- update to 0.6.1
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Jens Petersen <petersen@redhat.com> - 0.6-1
+- update to 0.6
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Mar 10 2019 Jens Petersen <petersen@redhat.com> - 0.5.3-12
+- unsubpackage cabal-doctest
+
+* Sat Feb 23 2019 Jens Petersen <petersen@redhat.com> - 0.5.3-11
+- update cabal-doctest to 1.0.6
+
+* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.5.3-10
+- refresh to cabal-rpm-0.13
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 28 2018 Jens Petersen <petersen@redhat.com> - 0.5.3-8
+- revise .cabal
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jan 24 2018 Jens Petersen <petersen@redhat.com> - 0.5.3-5
+- update to 0.5.3
+
+* Wed Jan 24 2018 Jens Petersen <petersen@redhat.com>
+- update cabal-doctest to 1.0.4
+
+* Wed Sep 13 2017 Jens Petersen <petersen@redhat.com> - 0.5.2-4
+- base-orphans is packaged now
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Feb 23 2017 Jens Petersen <petersen@redhat.com> - 0.5.2-1
+- update to 0.5.2
+- subpackage base-orphans and cabal-doctest
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Jan 09 2015 Ricky Elrod <codeblock@elrod.me> - 0.4.4-1
+- update to 0.4.4
+
+* Wed Mar 12 2014 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 0.4
+- spec file generated by cabal-rpm-0.8.10

distributive-0.6.2.1.cabal

@@ -1,107 +1,108 @@
-name:          distributive
+name:          distributive
-category:      Data Structures
+category:      Data Structures
-version:       0.5.3
+version:       0.6.2.1
-x-revision: 6
+x-revision: 1
-license:       BSD3
+license:       BSD3
-cabal-version: >= 1.8
+cabal-version: >= 1.10
-license-file:  LICENSE
+license-file:  LICENSE
-author:        Edward A. Kmett
+author:        Edward A. Kmett
-maintainer:    Edward A. Kmett <ekmett@gmail.com>
+maintainer:    Edward A. Kmett <ekmett@gmail.com>
-stability:     provisional
+stability:     provisional
-homepage:      http://github.com/ekmett/distributive/
+homepage:      http://github.com/ekmett/distributive/
-bug-reports:   http://github.com/ekmett/distributive/issues
+bug-reports:   http://github.com/ekmett/distributive/issues
-copyright:     Copyright (C) 2011-2016 Edward A. Kmett
+copyright:     Copyright (C) 2011-2016 Edward A. Kmett
-synopsis:      Distributive functors -- Dual to Traversable
+synopsis:      Distributive functors -- Dual to Traversable
-description:   Distributive functors -- Dual to Traversable
+description:   Distributive functors -- Dual to @Traversable@
-build-type:    Custom
+build-type:    Simple
-extra-source-files:
+tested-with:   GHC == 7.0.4
-  .travis.yml
+             , GHC == 7.2.2
-  .vim.custom
+             , GHC == 7.4.2
-  config
+             , GHC == 7.6.3
-  travis-cabal-apt-install
+             , GHC == 7.8.4
-  CHANGELOG.markdown
+             , GHC == 7.10.3
-  README.markdown
+             , GHC == 8.0.2
-  Warning.hs
+             , GHC == 8.2.2
-
+             , GHC == 8.4.4
-source-repository head
+             , GHC == 8.6.5
-  type: git
+             , GHC == 8.8.4
-  location: git://github.com/ekmett/distributive.git
+             , GHC == 8.10.3
-
+extra-source-files:
-custom-setup
+  .hlint.yaml
-  setup-depends:
+  .vim.custom
-    base >= 4 && <5,
+  config
-    Cabal,
+  CHANGELOG.markdown
-    cabal-doctest >= 1 && <1.1
+  README.markdown
-
+
-flag semigroups
+source-repository head
-  manual: True
+  type: git
-  default: True
+  location: git://github.com/ekmett/distributive.git
-  description:
+
-    You can disable the use of the `semigroups` package using `-f-semigroups`.
+flag semigroups
-    .
+  manual: True
-    Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
+  default: True
-
+  description:
-flag tagged
+    You can disable the use of the `semigroups` package using `-f-semigroups`.
-  manual: True
+    .
-  default: True
+    Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
-  description:
+
-    You can disable the use of the `tagged` package using `-f-tagged`.
+flag tagged
-    .
+  manual: True
-    Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
+  default: True
-
+  description:
-library
+    You can disable the use of the `tagged` package using `-f-tagged`.
-  build-depends:
+    .
-    base                >= 4   && < 5,
+    Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
-    base-orphans        >= 0.5.2 && < 1,
+
-    transformers        >= 0.2 && < 0.6,
+library
-    transformers-compat >= 0.3 && < 1
+  build-depends:
-
+    base                >= 4   && < 5,
-  hs-source-dirs:  src
+    base-orphans        >= 0.5.2 && < 1,
-  exposed-modules:
+    transformers        >= 0.3 && < 0.7
-    Data.Distributive
+
-
+  hs-source-dirs:  src
-  if impl(ghc>=7.2)
+  exposed-modules:
-    exposed-modules: Data.Distributive.Generic
+    Data.Distributive
-
+
-  if flag(tagged)
+  if impl(ghc>=7.2)
-    build-depends: tagged >= 0.7 && < 1
+    exposed-modules: Data.Distributive.Generic
-
+
-  if impl(ghc>=7.2 && < 7.6)
+  if flag(tagged)
-    build-depends: ghc-prim
+    build-depends: tagged >= 0.7 && < 1
-
+
-  if impl(ghc < 8.0)
+  if impl(ghc>=7.2 && < 7.6)
-    if flag(semigroups)
+    build-depends: ghc-prim
-      -- we need Functor Semi.Min etc.
+
-      build-depends: semigroups >= 0.13 && < 1
+  if impl(ghc < 8.0)
-
+    if flag(semigroups)
-  if impl(ghc < 7.8)
+      build-depends: semigroups >= 0.13 && < 1
-    hs-source-dirs: src-compat
+
-    other-modules: Data.Coerce
+  if impl(ghc < 7.8)
-
+    hs-source-dirs: src-compat
-  ghc-options: -Wall
+    other-modules: Data.Coerce
-
+
--- Verify the results of the examples
+  ghc-options: -Wall
-test-suite doctests
+
-  type:    exitcode-stdio-1.0
+  if impl(ghc >= 9.0)
-  main-is: doctests.hs
+    -- these flags may abort compilation with GHC-8.10
-  build-depends:
+    -- https://gitlab.haskell.org/ghc/ghc/-/merge_requests/3295
-    base      >= 4,
+    ghc-options: -Winferred-safe-imports -Wmissing-safe-haskell-mode
-    distributive,
+
-    doctest   >= 0.11.1 && <0.17
+  default-language: Haskell2010
-  ghc-options: -Wall -threaded
+
-  hs-source-dirs: tests
+test-suite spec
-
+  type:           exitcode-stdio-1.0
-test-suite spec
+  hs-source-dirs: tests
-  type:           exitcode-stdio-1.0
+  build-tool-depends:
-  hs-source-dirs: tests
+    hspec-discover:hspec-discover
-
+
-  build-depends:
+  build-depends:
-    base             >= 4    && < 5,
+    base             >= 4    && < 5,
-    distributive,
+    distributive,
-    generic-deriving >= 1.11 && < 2,
+    generic-deriving >= 1.11 && < 2,
-    hspec            >= 2    && < 3
+    hspec            >= 2    && < 3
-
+
-  main-is: Spec.hs
+  main-is: Spec.hs
-  other-modules: GenericsSpec
+  other-modules: GenericsSpec
-
+
-  ghc-options: -Wall -threaded -rtsopts
+  ghc-options: -Wall -threaded -rtsopts
+  default-language: Haskell2010

ghc-distributive.spec

@@ -1,55 +1,54 @@
-# generated by cabal-rpm-0.13
+# generated by cabal-rpm-2.1.0
-# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
 %global pkg_name distributive
 %global pkgver %{pkg_name}-%{version}
 
-%global cabaldoctest cabal-doctest-1.0.6
+%bcond_without tests
-%global subpkgs %{cabaldoctest}
-
-%bcond_with tests
 
 Name:           ghc-%{pkg_name}
-Version:        0.5.3
+Version:        0.6.2.1
-# can only be reset when all subpkgs bumped
+Release:        %autorelease
-Release:        11%{?dist}
 Summary:        Distributive functors -- Dual to Traversable
 
-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/%{cabaldoctest}/%{cabaldoctest}.tar.gz
+Source1:        https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal
-Source2:        https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal
 # End cabal-rpm sources
 
 # Begin cabal-rpm deps:
+BuildRequires:  dos2unix
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros-extra
+BuildRequires:  ghc-rpm-macros
+BuildRequires:  ghc-base-devel
 BuildRequires:  ghc-base-orphans-devel
-#BuildRequires:  ghc-cabal-doctest-devel
 BuildRequires:  ghc-tagged-devel
-BuildRequires:  ghc-transformers-compat-devel
 BuildRequires:  ghc-transformers-devel
+%if %{with ghc_prof}
+BuildRequires:  ghc-base-prof
+BuildRequires:  ghc-base-orphans-prof
+BuildRequires:  ghc-tagged-prof
+BuildRequires:  ghc-transformers-prof
+%endif
 %if %{with tests}
-BuildRequires:  ghc-doctest-devel
 BuildRequires:  ghc-generic-deriving-devel
 BuildRequires:  ghc-hspec-devel
+BuildRequires:  ghc-hspec-discover-devel
 %endif
 # End cabal-rpm deps
 
 %description
-Distributive functors -- Dual to Traversable.
+Distributive functors -- Dual to 'Traversable'.
 
 
 %package devel
 Summary:        Haskell %{pkg_name} library development files
 Provides:       %{name}-static = %{version}-%{release}
-Provides:       %{name}-doc = %{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}
 
@@ -57,52 +56,51 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 This package provides the Haskell %{pkg_name} library development files.
 
 
-%global main_version %{version}
+%if %{with haddock}
+%package doc
+Summary:        Haskell %{pkg_name} library documentation
+BuildArch:      noarch
+Requires:       ghc-filesystem
 
-%if %{defined ghclibdir}
+%description doc
-%ghc_lib_subpackage %{cabaldoctest}
+This package provides the Haskell %{pkg_name} library documentation.
 %endif
 
-%global version %{main_version}
+
+%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:
-%setup -q -n %{pkgver} -a1
+%setup -q -n %{pkgver}
-cp -bp %{SOURCE2} %{pkg_name}.cabal
+dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal
 # End cabal-rpm setup
 
-(
-cd %{cabaldoctest}
-cabal-tweak-dep-ver Cabal '<2.1' '<2.5'
-cabal-tweak-dep-ver base '<4.11' '<4.12'
-)
-
 
 %build
 # Begin cabal-rpm build:
-%ghc_libs_build %{subpkgs}
 %ghc_lib_build
 # End cabal-rpm build
 
 
 %install
 # Begin cabal-rpm install
-%ghc_libs_install %{subpkgs}
 %ghc_lib_install
 # End cabal-rpm install
 
 
 %check
+%if %{with tests}
 %cabal_test
-
+%endif
-
-%post devel
-%ghc_pkg_recache
-
-
-%postun devel
-%ghc_pkg_recache
 
 
 %files -f %{name}.files
@@ -115,55 +113,16 @@ cabal-tweak-dep-ver base '<4.11' '<4.12'
 %doc CHANGELOG.markdown README.markdown
 
 
+%if %{with haddock}
+%files doc -f %{name}-doc.files
+%license LICENSE
+%endif
+
+
+%if %{with ghc_prof}
+%files prof -f %{name}-prof.files
+%endif
+
+
 %changelog
-* Sat Feb 23 2019 Jens Petersen <petersen@redhat.com> - 0.5.3-11
+%autochangelog
-- update cabal-doctest to 1.0.6
-
-* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.5.3-10
-- refresh to cabal-rpm-0.13
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 28 2018 Jens Petersen <petersen@redhat.com> - 0.5.3-8
-- revise .cabal
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jan 24 2018 Jens Petersen <petersen@redhat.com> - 0.5.3-5
-- update to 0.5.3
-
-* Wed Jan 24 2018 Jens Petersen <petersen@redhat.com>
-- update cabal-doctest to 1.0.4
-
-* Wed Sep 13 2017 Jens Petersen <petersen@redhat.com> - 0.5.2-4
-- base-orphans is packaged now
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Feb 23 2017 Jens Petersen <petersen@redhat.com> - 0.5.2-1
-- update to 0.5.2
-- subpackage base-orphans and cabal-doctest
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Jan 09 2015 Ricky Elrod <codeblock@elrod.me> - 0.4.4-1
-- update to 0.4.4
-
-* Wed Mar 12 2014 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 0.4
-- spec file generated by cabal-rpm-0.8.10

sources

@@ -1,2 +1 @@
-SHA512 (distributive-0.5.3.tar.gz) = 34d6019dc4588d1a10a40daa09822b01660da9c485d06a28722727ca1d7850eeda676da255792335e38be509a2539c02e11a404d9c45618ae064d90718cad280
+SHA512 (distributive-0.6.2.1.tar.gz) = 387c7b6e0b2f917fd68d52ffbc79b9db21e488629309bfaf0dc77450bfd37c0f7f8a29458532616b5395552f84f3727b462cb2876e5aca79101e2c752b26e0a7
-SHA512 (cabal-doctest-1.0.6.tar.gz) = f009c91f9e9d2406a2ccb7049d554291527dcb3846fd63828147e03fc4c893223929261745ab5a8fb036bcf16b3c286587d3de8daa0fff330fb3c2d6b25fa399