From efe35035d162a0a52d363cf797bf711f27e2f21735fbf078854617e62981a535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:13 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hledger-lib revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hledger-lib?expand=0&rev=14 --- ghc-hledger-lib.changes | 138 ++++++++++++++++++++++++++++++++++++++ ghc-hledger-lib.spec | 11 ++- hledger-lib-1.19.1.tar.gz | 3 - hledger-lib-1.20.1.tar.gz | 3 + 4 files changed, 149 insertions(+), 6 deletions(-) delete mode 100644 hledger-lib-1.19.1.tar.gz create mode 100644 hledger-lib-1.20.1.tar.gz diff --git a/ghc-hledger-lib.changes b/ghc-hledger-lib.changes index a90db7c..894f7c9 100644 --- a/ghc-hledger-lib.changes +++ b/ghc-hledger-lib.changes @@ -1,3 +1,141 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + +------------------------------------------------------------------- +Wed Dec 16 17:26:09 UTC 2020 - psimons@suse.com + +- Update hledger-lib to version 1.20.1. + # 1.20.1 2020-12-15 + + - renamed: updateReportSpecFromOpts -> updateReportSpec[With] + +------------------------------------------------------------------- +Sun Dec 6 13:33:45 UTC 2020 - psimons@suse.com + +- Update hledger-lib to version 1.20. + # 1.20 2020-12-05 + + - added: journalApplyAliases, transactionApplyAliases, postingApplyAliases + + - a new more robust price lookup implementation, fgl library dropped (#1402) + + - Reverted a stripAnsi change in 1.19.1 that caused a 3x slowdown of amount rendering + in terminal reports. (#1350) + + - Amount and table rendering has been improved, so that stripAnsi is no longer needed. + This speeds up amount rendering in the terminal, speeding up some reports by 10% or more since 1.19. + (Stephen Morgan) + + - global commodity display styles can now be set in InputOpts or Journal, + overriding all others (declared or inferred). This is used by the import + command and probably command-line options in future. + + - Journal keeps a new piece of parsing state, a decimal mark character, + which can optionally be set to force the number format expected by all + amount parsers. + + - Remove Empty Query constructor, which does nothing and has done so for a very long time. (Stephen Morgan) + + - In ReportOpts, store query terms term-by-term in a list in querystring_. (Stephen Morgan) + This helps deal with tricky quoting issues, as we no longer have to make + sure everything is quoted properly before merging it into a string. + + - Implement concat(Top|Bottom)Padded in terms of renderRow, allowing them to be width aware. (Stephen Morgan) + + - Expand Tabular.AsciiWide to allow multiline, custom-width, + vertically/horizontally-aligned cells, and optional table borders. + (Stephen Morgan) + + - Introduce showMixed*Unnormalised, eliminate most direct calls of strWidth. (Stephen Morgan) + + - showMixedAmountElided now makes better use of space, showing as many + Amounts possible as long as they and the elision string fit within + 32 characters. (Stephen Morgan) + + - Add Functor instance for CompoundPeriodicReport. (Stephen Morgan) + + - Generalise CBCSubreportSpec to allow more subreport control. (Stephen Morgan) + + - Export some MultiBalanceReport helper functions. (Stephen Morgan) + + - Make Default instances clearer, remove Default instance for Bool. (Stephen Morgan) + + - Many ReportOpts-related changes, such as the addition of ReportSpec, aimed + at preventing runtime errors (from parsing: regexps, dates, format strings; + from not having today's date set; etc.) + ReportSpec holds a ReportOpts, the day of the report, and the Query generated from these. + + - StringFormat now takes an optional overline width, which is + currently only used by defaultBalanceLineFormat. (Stephen Morgan) + + - quoteIfNeeded should not escape the backslashes in unicode code points. (Stephen Morgan) + + - Export OrdPlus and constructors. (Stephen Morgan) + + - Debug output now uses pretty-simple instead pretty-show. + This hopefully gives overall nicer debug output (eg in colour), + including for values which don't have Read-able Show output. + This means that we can start removing custom Show instances + that were a workaround for pretty-show. Eg account names + in debug output no longer show their colons as underscores. + + Here's some old pretty-show output: + + CsvRules + { rdirectives = [ ( "skip" , "1" ) ] + , rcsvfieldindexes = [ ( "date" , 1 ) , ( "amount" , 2 ) ] + , rassignments = [ ( "amount" , "%2" ) , ( "date" , "%1" ) ] + , rconditionalblocks = [] + } + + And the new pretty-simple output: + + CsvRules + { rdirectives= + [ ( "skip", "1" ) ] + , rcsvfieldindexes= + [ ( "date", 1 ), ( "amount", 2 ) ] + , rassignments= + [ ( "amount", "%2" ), ( "date", "%1" ) ] + , rconditionalblocks= [] + } + + We require pretty-simple 4.0.0.0 to get this compact output. + It's a little less compact than pretty-show, but not too bad. + Non-compact pretty-simple output would be: + + CsvRules + { rdirectives= + [ + ( "skip" + , "1B" + ) + ] + , rcsvfieldindexes= + [ + ( "date" + , 1 + ) + , + ( "amount" + , 2 + ) + ] + , rassignments= + [ + ( "amount" + , "%2" + ) + , + ( "date" + , "%1" + ) + ] + , rconditionalblocks=[] + } + ------------------------------------------------------------------- Tue Sep 8 02:00:51 UTC 2020 - psimons@suse.com diff --git a/ghc-hledger-lib.spec b/ghc-hledger-lib.spec index 947e99b..9151a34 100644 --- a/ghc-hledger-lib.spec +++ b/ghc-hledger-lib.spec @@ -19,7 +19,7 @@ %global pkg_name hledger-lib %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.19.1 +Version: 1.20.1 Release: 0 Summary: A reusable library providing the core functionality of hledger License: GPL-3.0-or-later @@ -43,7 +43,6 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-extra-devel -BuildRequires: ghc-fgl-devel BuildRequires: ghc-file-embed-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-hashtables-devel @@ -52,7 +51,7 @@ BuildRequires: ghc-mtl-devel BuildRequires: ghc-old-time-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-parser-combinators-devel -BuildRequires: ghc-pretty-show-devel +BuildRequires: ghc-pretty-simple-devel BuildRequires: ghc-regex-tdfa-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-safe-devel @@ -68,6 +67,12 @@ BuildRequires: ghc-transformers-devel BuildRequires: ghc-uglymemo-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-utf8-string-devel +# GHC dont support i586 +%ifarch %{ix86} +ExclusiveArch: i586 i686 +ExclusiveArch: i686 +%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} +%endif %if %{with tests} BuildRequires: ghc-doctest-devel %endif diff --git a/hledger-lib-1.19.1.tar.gz b/hledger-lib-1.19.1.tar.gz deleted file mode 100644 index 75205d6..0000000 --- a/hledger-lib-1.19.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cabf263fe8a3c38822c9146b54a519fe56d369456c72be6db5a88c1c0208c15f -size 336130 diff --git a/hledger-lib-1.20.1.tar.gz b/hledger-lib-1.20.1.tar.gz new file mode 100644 index 0000000..19c224c --- /dev/null +++ b/hledger-lib-1.20.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c14bc3e1b704f657ece7741566330c44be1009ae66e14d98374aa513992e06ce +size 346386