From 6705635e4e427c9e9a5bb3f104b215eb790f93289ee4396fa2a7badcb46b2a50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Apr 2024 14:36:12 +0000 Subject: [PATCH 1/4] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:hledger revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/hledger?expand=0&rev=58 --- hledger-1.32.3.tar.gz | 3 --- hledger-1.33.tar.gz | 3 +++ hledger.changes | 9 +++++++++ hledger.spec | 7 +++---- 4 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 hledger-1.32.3.tar.gz create mode 100644 hledger-1.33.tar.gz diff --git a/hledger-1.32.3.tar.gz b/hledger-1.32.3.tar.gz deleted file mode 100644 index 41a4f85..0000000 --- a/hledger-1.32.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2963e16159ccf5da73beb6f9ecdbaafbd29819954a5aff00e1037f50a4ba7fd6 -size 1102346 diff --git a/hledger-1.33.tar.gz b/hledger-1.33.tar.gz new file mode 100644 index 0000000..01c4571 --- /dev/null +++ b/hledger-1.33.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9107e527784916c70d2eafaca1773b9eb4b88bcbd0ce3d29796122f976991785 +size 1133990 diff --git a/hledger.changes b/hledger.changes index f255ad2..494d180 100644 --- a/hledger.changes +++ b/hledger.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Apr 18 23:38:06 UTC 2024 - Peter Simons + +- Update hledger to version 1.33. + Upstream's change log file format is strange (too much unmodified + text at at the top). The automatic updater cannot extract the + relevant additions. You can find the file at: + http://hackage.haskell.org/package/hledger-1.33/src/CHANGES.md + ------------------------------------------------------------------- Wed Feb 28 15:29:58 UTC 2024 - Peter Simons diff --git a/hledger.spec b/hledger.spec index adcab4b..af306ac 100644 --- a/hledger.spec +++ b/hledger.spec @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: %{pkg_name} -Version: 1.32.3 +Version: 1.33 Release: 0 Summary: Command-line interface for the hledger accounting system License: GPL-3.0-or-later URL: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz -Patch1: fix-build-with-ghc-9.8.x.patch BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Decimal-devel @@ -154,8 +153,8 @@ Supplements: (ghc-%{pkg_name}-devel and ghc-prof) This package provides the Haskell %{pkg_name} profiling library. %prep -%autosetup -p1 -cabal-tweak-dep-ver base "<4.19" "< 5" +%autosetup +cabal-tweak-dep-ver process ">=1.6.19.0" ">=1.6.18.0" %build %ghc_lib_build From 1d84c9d78ce696f278a8354e7b6ce917f44adf55cf534e44fc43c1d23ffce8c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2024 13:45:33 +0000 Subject: [PATCH 2/4] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:hledger revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/hledger?expand=0&rev=59 --- hledger-1.33.1.tar.gz | 3 +++ hledger-1.33.tar.gz | 3 --- hledger.changes | 9 +++++++++ hledger.spec | 3 +-- 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 hledger-1.33.1.tar.gz delete mode 100644 hledger-1.33.tar.gz diff --git a/hledger-1.33.1.tar.gz b/hledger-1.33.1.tar.gz new file mode 100644 index 0000000..fd1bf0d --- /dev/null +++ b/hledger-1.33.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e0829d349b71facd4f01efc3e662b413b64698a2de374039293481a18397d93 +size 1133973 diff --git a/hledger-1.33.tar.gz b/hledger-1.33.tar.gz deleted file mode 100644 index 01c4571..0000000 --- a/hledger-1.33.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9107e527784916c70d2eafaca1773b9eb4b88bcbd0ce3d29796122f976991785 -size 1133990 diff --git a/hledger.changes b/hledger.changes index 494d180..1469ae5 100644 --- a/hledger.changes +++ b/hledger.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu May 2 11:03:18 UTC 2024 - Peter Simons + +- Update hledger to version 1.33.1. + Upstream's change log file format is strange (too much unmodified + text at at the top). The automatic updater cannot extract the + relevant additions. You can find the file at: + http://hackage.haskell.org/package/hledger-1.33.1/src/CHANGES.md + ------------------------------------------------------------------- Thu Apr 18 23:38:06 UTC 2024 - Peter Simons diff --git a/hledger.spec b/hledger.spec index af306ac..7bcb0a5 100644 --- a/hledger.spec +++ b/hledger.spec @@ -20,7 +20,7 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: %{pkg_name} -Version: 1.33 +Version: 1.33.1 Release: 0 Summary: Command-line interface for the hledger accounting system License: GPL-3.0-or-later @@ -154,7 +154,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep %autosetup -cabal-tweak-dep-ver process ">=1.6.19.0" ">=1.6.18.0" %build %ghc_lib_build From edb33a535881d277d1d541ed8a35d07d2f3e80e4b394799028080835ea36b6e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2024 15:34:03 +0000 Subject: [PATCH 3/4] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:hledger revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/hledger?expand=0&rev=60 --- hledger.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hledger.changes b/hledger.changes index 1469ae5..e7bc535 100644 --- a/hledger.changes +++ b/hledger.changes @@ -16,6 +16,8 @@ Thu Apr 18 23:38:06 UTC 2024 - Peter Simons relevant additions. You can find the file at: http://hackage.haskell.org/package/hledger-1.33/src/CHANGES.md +- Drop obsolete "fix-build-with-ghc-9.8.x.patch". + ------------------------------------------------------------------- Wed Feb 28 15:29:58 UTC 2024 - Peter Simons From 85a8ee0925316ac13ceb766b99c6df9ec31cb21cbc22cf8e71522a0a3ad98606 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 8 May 2024 14:56:11 +0000 Subject: [PATCH 4/4] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:hledger revision:14, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/hledger?expand=0&rev=61 --- fix-build-with-ghc-9.8.x.patch | 39 ---------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 fix-build-with-ghc-9.8.x.patch diff --git a/fix-build-with-ghc-9.8.x.patch b/fix-build-with-ghc-9.8.x.patch deleted file mode 100644 index a220f6d..0000000 --- a/fix-build-with-ghc-9.8.x.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 034d37c3bef9ba99a1db7344127e814a9219047a Mon Sep 17 00:00:00 2001 -From: Simon Michael -Date: Thu, 4 Jan 2024 16:53:24 -1000 -Subject: [PATCH] fix:imp:stack: build with ghc 9.8, latest stackage nightly - (part 2) - -Fix the build with GHC < 9.8. - -This reapplies commit 87600e5dd, this time with the correct description. ---- - hledger/Hledger/Cli/Script.hs | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -Index: hledger-1.32.3/Hledger/Cli/Script.hs -=================================================================== ---- hledger-1.32.3.orig/Hledger/Cli/Script.hs 2024-01-28 10:05:20.000000000 +0000 -+++ hledger-1.32.3/Hledger/Cli/Script.hs 2024-02-28 15:28:33.604355754 +0000 -@@ -3,6 +3,7 @@ A convenient module to import in hledger - aiming to provide the most useful imports and reduce boilerplate. - |-} - -+{-# LANGUAGE CPP #-} - {-# LANGUAGE PackageImports #-} - - module Hledger.Cli.Script -@@ -15,7 +16,13 @@ import Control.Concurrent as M - import Control.Monad as M - import Data.Char as M - import Data.Either as M -+ - import Data.Functor as M -+#if MIN_VERSION_base(4,19,0) -+ hiding (unzip) -+#endif -+-- import Data.Functor as M (Functor, fmap, (<$), ($>), (<$>), (<&>)) -- or without CPP ? redundant import warning -+ - import Data.List as M - import Data.Maybe as M - import Data.Ord as M