From 7784be91777bdb98f327432addce1ad16e67fc2b Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: May 24 2016 13:27:06 +0000 Subject: Revert 0.27 Forgot there's missing deps yet. --- diff --git a/.gitignore b/.gitignore index 183fbcc..6043622 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,3 @@ /hledger-lib-0.19.3.tar.gz /hledger-lib-0.23.2.tar.gz /hledger-lib-0.24.tar.gz -/hledger-lib-0.27.tar.gz diff --git a/ghc-hledger-lib.spec b/ghc-hledger-lib.spec index 0a427ea..11c5ee9 100644 --- a/ghc-hledger-lib.spec +++ b/ghc-hledger-lib.spec @@ -5,13 +5,15 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.27 -Release: 2%{?dist} -Summary: Core data types, parsers and functionality for the hledger accounting tool +Version: 0.24 +Release: 4%{?dist} +Summary: Core data types, parsers and utilities for the hledger accounting tool License: GPLv3 -Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +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 BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -19,27 +21,24 @@ 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 @@ -48,10 +47,9 @@ BuildRequires: ghc-test-framework-hunit-devel # End cabal-rpm deps %description -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 +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. @@ -70,6 +68,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +%patch0 -p1 -b .no-pretty-show %build @@ -79,8 +78,6 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %check %if %{with tests} @@ -97,19 +94,13 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files -f %{name}.files -%license LICENSE +%doc LICENSE %files devel -f %{name}-devel.files %changelog -* Tue May 24 2016 Ben Boeckel - 0.27-2 -- Rebuild for ghc-cmdargs, ghc-regexpr, ghc-split - -* Sat Apr 23 2016 Ben Boeckel - 0.27-1 -- update to 0.27 - * Wed Feb 03 2016 Fedora Release Engineering - 0.24-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 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 3f00de5..f423aa7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff6dc5ef98d2af28bb5fcefe7848ebae hledger-lib-0.27.tar.gz +a009ac6ba2659343757a60052387de21 hledger-lib-0.24.tar.gz