From 4e645e70d1c78ad54d87affcf353533df2118959 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Jan 2023 01:58:50 +0800 Subject: [PATCH] update to 1.27.1 refresh to cabal-rpm-2.1.0 with SPDX migration --- .gitignore | 3 +++ hledger.spec | 69 ++++++++++++++++++++++++++++++++++++++++++++-------- sources | 5 ++-- 3 files changed, 65 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index e064809..6506436 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,6 @@ /utility-ht-0.0.16.tar.gz /lucid-2.9.12.1.tar.gz /hledger-1.21.tar.gz +/hledger-1.27.1.tar.gz +/lucid-2.11.1.tar.gz +/breakpoint-0.1.2.0.tar.gz diff --git a/hledger.spec b/hledger.spec index 44cc30f..4175d0c 100644 --- a/hledger.spec +++ b/hledger.spec @@ -1,23 +1,23 @@ -# 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 hledger %global pkgver %{pkg_name}-%{version} %global utilityht utility-ht-0.0.16 -%global lucid lucid-2.9.12.1 +%global lucid lucid-2.11.1 %global subpkgs %{utilityht} %{lucid} # utility-ht requires doctest-exitcode-stdio & doctest-lib %bcond_with tests Name: %{pkg_name} -Version: 1.21 +Version: 1.27.1 # can only be reset when all subpkgs bumped -Release: 6%{?dist} +Release: 7%{?dist} Summary: Command-line interface for the hledger accounting system -License: GPLv3+ +License: GPL-3.0-or-later Url: https://hackage.haskell.org/package/%{name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz @@ -28,12 +28,52 @@ Source2: https://hackage.haskell.org/package/%{lucid}/%{lucid}.tar.gz # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-Decimal-devel +BuildRequires: ghc-Diff-devel +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-ansi-terminal-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-breakpoint-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-cmdargs-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-data-default-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-extra-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-githash-devel +BuildRequires: ghc-hashable-devel +BuildRequires: ghc-haskeline-devel +BuildRequires: ghc-hledger-lib-devel +#BuildRequires: ghc-lucid-devel +BuildRequires: ghc-math-functions-devel +BuildRequires: ghc-megaparsec-devel +BuildRequires: ghc-microlens-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-process-devel +BuildRequires: ghc-regex-tdfa-devel +BuildRequires: ghc-safe-devel +BuildRequires: ghc-shakespeare-devel +BuildRequires: ghc-split-devel +BuildRequires: ghc-tabular-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-temporary-devel +BuildRequires: ghc-terminfo-devel +BuildRequires: ghc-text-devel +BuildRequires: ghc-time-devel +BuildRequires: ghc-timeit-devel +BuildRequires: ghc-transformers-devel +BuildRequires: ghc-unordered-containers-devel +BuildRequires: ghc-utf8-string-devel +#BuildRequires: ghc-utility-ht-devel +BuildRequires: ghc-wizards-devel +%if %{with ghc_prof} BuildRequires: ghc-Decimal-prof BuildRequires: ghc-Diff-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-ansi-terminal-prof BuildRequires: ghc-base-prof -BuildRequires: ghc-base-compat-batteries-prof +BuildRequires: ghc-breakpoint-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-cmdargs-prof BuildRequires: ghc-containers-prof @@ -41,14 +81,15 @@ BuildRequires: ghc-data-default-prof BuildRequires: ghc-directory-prof BuildRequires: ghc-extra-prof BuildRequires: ghc-filepath-prof +BuildRequires: ghc-githash-prof BuildRequires: ghc-hashable-prof BuildRequires: ghc-haskeline-prof BuildRequires: ghc-hledger-lib-prof #BuildRequires: ghc-lucid-prof BuildRequires: ghc-math-functions-prof BuildRequires: ghc-megaparsec-prof +BuildRequires: ghc-microlens-prof BuildRequires: ghc-mtl-prof -BuildRequires: ghc-old-time-prof BuildRequires: ghc-process-prof BuildRequires: ghc-regex-tdfa-prof BuildRequires: ghc-safe-prof @@ -66,9 +107,14 @@ BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-utf8-string-prof #BuildRequires: ghc-utility-ht-prof BuildRequires: ghc-wizards-prof +%endif # for missing dep 'lucid': +BuildRequires: ghc-blaze-builder-devel +BuildRequires: ghc-mmorph-devel +%if %{with ghc_prof} BuildRequires: ghc-blaze-builder-prof BuildRequires: ghc-mmorph-prof +%endif # End cabal-rpm deps %description @@ -128,8 +174,8 @@ This package provides the Haskell %{name} profiling library. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{utilityht} -%ghc_lib_subpackage %{lucid} +%ghc_lib_subpackage -l BSD-3-Clause %{utilityht} +%ghc_lib_subpackage -l BSD-3-Clause %{lucid} %endif %global version %{main_version} @@ -153,7 +199,6 @@ cabal-tweak-drop-dep mtl-compat # Begin cabal-rpm install %ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_rpath %{pkgver} # End cabal-rpm install install -Dp -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 @@ -196,6 +241,10 @@ install -Dp -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 %changelog +* Sun Jan 22 2023 Jens Petersen - 1.27.1-7 +- https://hackage.haskell.org/package/hledger-1.27.1/changelog +- refresh to cabal-rpm-2.1.0 with SPDX migration + * Thu Jul 21 2022 Fedora Release Engineering - 1.21-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 115e068..0e2fb4e 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ +SHA512 (hledger-1.27.1.tar.gz) = 59d1b6d2209a029603725156200dca6dd73296e544b70fe1c4f2bcb053befb91f78b161db98f414425c774c56a73ecc13ee4f06db5b4c8100d52e0484f5125da SHA512 (utility-ht-0.0.16.tar.gz) = dc43586c4cd3816b8d9c1f2d952e82a2b633d86df1bdcb19bcaaf96977d3b9b4399cbf6e7c12a1f7f2a8cd0d461a5964af8e2748a016406b1364a9a327d67a79 -SHA512 (lucid-2.9.12.1.tar.gz) = 2572047a2711ae26b3e736ac73acb5c154d7493d47323853fda0503fa75ded35df9d7819f43879583b097718ee90235c71d8c9839c4a89ceecaa8a830b077651 -SHA512 (hledger-1.21.tar.gz) = 4ae5e9dc0160759f85b5c9d9ae4d4faeb2a63a41dd5376e658ac6fa13ff2b72b5e808ed0d52ed50d83e9bade3ce8839c23aabbbf6baccf236b579b07898dd3ba +SHA512 (lucid-2.11.1.tar.gz) = 9dd26a84b5ec00830a749f239298b3fd90f0682fc40b0287519cb7d987b80fa12322fc0be3e5d3720d84771cc488cd70eb77c7a4150e700128c9430893ff2179 +SHA512 (breakpoint-0.1.2.0.tar.gz) = ae22382e70cf7b425db468e3e2065ee770657b71c10a89311c2b39549bace68678e25616860bb807c2fbe7a76b8d4bbb527d73f28b3fd4bc92e837d817e0df2e