From 2c21e434e127ce424798c511775e87ee139b7208 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sep 05 2016 03:17:29 +0000 Subject: update to 0.27.1 --- diff --git a/.gitignore b/.gitignore index 6043622..f8c45eb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /hledger-lib-0.19.3.tar.gz /hledger-lib-0.23.2.tar.gz /hledger-lib-0.24.tar.gz +/hledger-lib-0.27.1.tar.gz diff --git a/ghc-hledger-lib.spec b/ghc-hledger-lib.spec index 55ec4ac..b865391 100644 --- a/ghc-hledger-lib.spec +++ b/ghc-hledger-lib.spec @@ -1,3 +1,4 @@ +# generated by cabal-rpm-0.10.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name hledger-lib @@ -5,15 +6,13 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.24 -Release: 5%{?dist} -Summary: Core data types, parsers and utilities for the hledger accounting tool +Version: 0.27.1 +Release: 1%{?dist} +Summary: Core data types, parsers and functionality for the hledger accounting tools License: GPLv3 -URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -# rhbz(974725) -Patch0: hledger-lib-0.24-no-pretty-show.patch +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -21,24 +20,26 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-Decimal-devel BuildRequires: ghc-HUnit-devel BuildRequires: ghc-array-devel +BuildRequires: ghc-base-compat-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-cmdargs-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-csv-devel +BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel +#BuildRequires: ghc-mtl-compat-devel BuildRequires: ghc-mtl-devel -BuildRequires: ghc-old-locale-devel BuildRequires: ghc-old-time-devel BuildRequires: ghc-parsec-devel -#BuildRequires: ghc-pretty-show-devel +BuildRequires: ghc-pretty-show-devel BuildRequires: ghc-regex-tdfa-devel -BuildRequires: ghc-regexpr-devel BuildRequires: ghc-safe-devel BuildRequires: ghc-split-devel BuildRequires: ghc-time-devel BuildRequires: ghc-transformers-devel +BuildRequires: ghc-uglymemo-devel BuildRequires: ghc-utf8-string-devel %if %{with tests} BuildRequires: ghc-test-framework-devel @@ -47,9 +48,10 @@ BuildRequires: ghc-test-framework-hunit-devel # End cabal-rpm deps %description -Hledger is a library and set of user tools for working with financial data (or -anything that can be tracked in a double-entry accounting ledger.) It is a -haskell port and friendly fork of John Wiegley's Ledger. hledger provides +This is a reusable library containing hledger's core functionality. +hledger is a cross-platform program for tracking money, time, or any other +commodity, using double-entry accounting and a simple, editable file format. +It is inspired by and largely compatible with ledger(1). hledger provides command-line, curses and web interfaces, and aims to be a reliable, practical tool for daily use. @@ -68,7 +70,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -%patch0 -p1 -b .no-pretty-show %build @@ -78,13 +79,9 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %check -%if %{with tests} -%cabal test -%endif +%cabal_test %post devel @@ -96,13 +93,17 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files -f %{name}.files -%license LICENSE %files devel -f %{name}-devel.files +%doc CHANGES %changelog +* Mon Sep 5 2016 Jens Petersen - 0.27.1-1 +- update to 0.27.1 +- use pretty-show + * Tue May 24 2016 Ben Boeckel - 0.24-5 - Rebuild for ghc-cmdargs, ghc-regexpr, ghc-split - doc -> license macro diff --git a/hledger-lib-0.24-no-pretty-show.patch b/hledger-lib-0.24-no-pretty-show.patch deleted file mode 100644 index 6a8629c..0000000 --- a/hledger-lib-0.24-no-pretty-show.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -u -r -U5 hledger-lib-0.24/Hledger/Utils/Debug.hs hledger-lib-0.24.no-pretty-show/Hledger/Utils/Debug.hs ---- hledger-lib-0.24/Hledger/Utils/Debug.hs 2014-12-25 14:40:57.000000000 -0500 -+++ hledger-lib-0.24.no-pretty-show/Hledger/Utils/Debug.hs 2015-03-01 21:45:01.934290509 -0500 -@@ -8,13 +8,10 @@ - -- http://hackage.haskell.org/packages/archive/traced/2009.7.20/doc/html/Debug-Traced.html - - module Hledger.Utils.Debug ( - module Hledger.Utils.Debug - ,module Debug.Trace --#if __GLASGOW_HASKELL__ >= 704 -- ,ppShow --#endif - ) - where - - import Control.Monad (when) - import Data.List -@@ -24,17 +21,12 @@ - import System.Exit - import System.IO.Unsafe (unsafePerformIO) - import Text.Parsec - import Text.Printf - --#if __GLASGOW_HASKELL__ >= 704 --import Text.Show.Pretty (ppShow) --#else ---- the required pretty-show version requires GHC >= 7.4 - ppShow :: Show a => a -> String - ppShow = show --#endif - - - -- | Trace (print on stdout at runtime) a showable value. - -- (for easily tracing in the middle of a complex expression) - strace :: Show a => a -> a -diff -u -r -U5 hledger-lib-0.24/hledger-lib.cabal hledger-lib-0.24.no-pretty-show/hledger-lib.cabal ---- hledger-lib-0.24/hledger-lib.cabal 2014-12-25 14:40:57.000000000 -0500 -+++ hledger-lib-0.24.no-pretty-show/hledger-lib.cabal 2015-03-01 21:39:31.437549354 -0500 -@@ -102,12 +102,10 @@ - ,split >= 0.1 && < 0.3 - ,time - ,transformers >= 0.2 && < 0.5 - ,utf8-string >= 0.3.5 && < 0.4 - ,HUnit -- if impl(ghc >= 7.4) -- build-depends: pretty-show >= 1.6.4 - - - test-suite tests - type: exitcode-stdio-1.0 - main-is: suite.hs -@@ -137,12 +135,10 @@ - , split - , test-framework - , test-framework-hunit - , time - , transformers -- if impl(ghc >= 7.4) -- build-depends: pretty-show >= 1.6.4 - - -- cf http://www.haskell.org/cabal/release/cabal-latest/doc/users-guide/authors.html - - -- Additional dependencies: - -- required for make test: test-framework, test-framework-hunit diff --git a/sources b/sources index f423aa7..150e4ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a009ac6ba2659343757a60052387de21 hledger-lib-0.24.tar.gz +4eb1cf02959487b818a5596dac7b4a00 hledger-lib-0.27.1.tar.gz