diff --git a/ghc-hledger-lib.spec b/ghc-hledger-lib.spec index d180871..0341bd2 100644 --- a/ghc-hledger-lib.spec +++ b/ghc-hledger-lib.spec @@ -5,15 +5,15 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.24 -Release: 2%{?dist} +Version: 0.26 +Release: 1%{?dist} 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 +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz # rhbz(974725) -Patch0: hledger-lib-0.24-no-pretty-show.patch +Patch0: hledger-lib-0.26-no-pretty-show.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -21,6 +21,7 @@ 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 @@ -28,13 +29,12 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-csv-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-regex-tdfa-devel -BuildRequires: ghc-regexpr-devel BuildRequires: ghc-safe-devel BuildRequires: ghc-split-devel BuildRequires: ghc-time-devel @@ -94,13 +94,16 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %changelog +* Mon Jul 20 2015 Ben Boeckel - 0.26-1 +- Update to 0.26 + * Wed Jun 17 2015 Fedora Release Engineering - 0.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 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/hledger-lib-0.26-no-pretty-show.patch b/hledger-lib-0.26-no-pretty-show.patch new file mode 100644 index 0000000..4077aac --- /dev/null +++ b/hledger-lib-0.26-no-pretty-show.patch @@ -0,0 +1,66 @@ +diff -u -r -U5 --no-dereference hledger-lib-0.26/Hledger/Utils/Debug.hs hledger-lib-0.26.no-pretty-show/Hledger/Utils/Debug.hs +--- hledger-lib-0.26/Hledger/Utils/Debug.hs 2015-07-12 21:14:28.000000000 -0400 ++++ hledger-lib-0.26.no-pretty-show/Hledger/Utils/Debug.hs 2015-07-20 19:36:18.993285855 -0400 +@@ -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 --no-dereference hledger-lib-0.26/hledger-lib.cabal hledger-lib-0.26.no-pretty-show/hledger-lib.cabal +--- hledger-lib-0.26/hledger-lib.cabal 2015-07-12 21:14:28.000000000 -0400 ++++ hledger-lib-0.26.no-pretty-show/hledger-lib.cabal 2015-07-20 19:36:51.335500759 -0400 +@@ -108,12 +108,10 @@ + ,safe >= 0.2 + ,split >= 0.1 && < 0.3 + ,transformers >= 0.2 && < 0.5 + ,utf8-string >= 0.3.5 && < 1.1 + ,HUnit +- if impl(ghc >= 7.4) +- build-depends: pretty-show >= 1.6.4 + if flag(old-locale) + build-depends: time < 1.5, old-locale + else + build-depends: time >= 1.5 + +@@ -146,12 +144,10 @@ + , safe + , split + , test-framework + , test-framework-hunit + , transformers +- if impl(ghc >= 7.4) +- build-depends: pretty-show >= 1.6.4 + if flag(old-locale) + build-depends: time < 1.5, old-locale + else + build-depends: time >= 1.5 + +Only in hledger-lib-0.26.no-pretty-show: hledger-lib.cabal.orig +Only in hledger-lib-0.26.no-pretty-show: hledger-lib.cabal.rej