[ghc-hledger-lib] update to 0.24

Ben Boeckel mathstuf at fedoraproject.org
Mon Mar 2 02:51:35 UTC 2015


commit 4a0745b2f84b587ae79df7c43cc2935e075a16cf
Author: Ben Boeckel <mathstuf at gmail.com>
Date:   Sun Mar 1 21:17:32 2015 -0500

    update to 0.24

 .gitignore                            |  1 +
 ghc-hledger-lib.spec                  | 27 ++++++++++-----
 hledger-lib-0.24-no-pretty-show.patch | 64 +++++++++++++++++++++++++++++++++++
 hledger-lib-pretty-show.patch         | 48 --------------------------
 sources                               |  2 +-
 5 files changed, 84 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3792be2..6043622 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /hledger-lib-0.17.tar.gz
 /hledger-lib-0.19.3.tar.gz
 /hledger-lib-0.23.2.tar.gz
+/hledger-lib-0.24.tar.gz
diff --git a/ghc-hledger-lib.spec b/ghc-hledger-lib.spec
index 665ed31..5c3612a 100644
--- a/ghc-hledger-lib.spec
+++ b/ghc-hledger-lib.spec
@@ -4,23 +4,24 @@
 
 %bcond_with tests
 
-# no useful debuginfo for Haskell packages without C sources
-%global debug_package %{nil}
-
 Name:           ghc-%{pkg_name}
-Version:        0.23.2
+Version:        0.24
 Release:        1%{?dist}
-Summary:        Core library for the hledger accounting tool
+Summary:        Core data types, parsers and utilities for the hledger accounting tool
 
 License:        GPLv3
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Patch0:         hledger-lib-pretty-show.patch
+# rhbz(974725)
+Patch0:         hledger-lib-0.24-no-pretty-show.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
+BuildRequires:  ghc-Decimal-devel
 BuildRequires:  ghc-HUnit-devel
+BuildRequires:  ghc-array-devel
+BuildRequires:  ghc-blaze-markup-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-cmdargs-devel
 BuildRequires:  ghc-containers-devel
@@ -31,6 +32,7 @@ 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-regex-tdfa-devel
 BuildRequires:  ghc-regexpr-devel
 BuildRequires:  ghc-safe-devel
@@ -45,8 +47,11 @@ BuildRequires:  ghc-test-framework-hunit-devel
 # End cabal-rpm deps
 
 %description
-This is the core library of the hledger financial app used
-by various hledger packages.
+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
+command-line, curses and web interfaces, and aims to be a reliable, practical
+tool for daily use.
 
 
 %package devel
@@ -63,7 +68,7 @@ This package provides the Haskell %{pkg_name} library development files.
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
-%patch0 -p1 -b .orig
+%patch0 -p1 -b .no-pretty-show
 
 
 %build
@@ -96,6 +101,10 @@ This package provides the Haskell %{pkg_name} library development files.
 
 
 %changelog
+* Sun Mar 01 2015 Ben Boeckel <mathstuf at gmail.com> - 0.24-1
+- update to 0.24
+- cblrpm refresh
+
 * Fri Aug 29 2014 Jens Petersen <petersen at redhat.com> - 0.23.2-1
 - update to 0.23.2
 - patch out pretty-show until available in Fedora
diff --git a/hledger-lib-0.24-no-pretty-show.patch b/hledger-lib-0.24-no-pretty-show.patch
new file mode 100644
index 0000000..6a8629c
--- /dev/null
+++ b/hledger-lib-0.24-no-pretty-show.patch
@@ -0,0 +1,64 @@
+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 a833e07..f423aa7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eeba67101cf2d8e51b84b9ba965db0f8  hledger-lib-0.23.2.tar.gz
+a009ac6ba2659343757a60052387de21  hledger-lib-0.24.tar.gz


More information about the scm-commits mailing list