update to 1.4

This commit is contained in:
Jens Petersen 2018-01-24 14:53:01 +01:00
parent 172bad39ee
commit a2ea310a05
3 changed files with 27 additions and 27 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@
/haskell-src-meta-0.7.0.1.tar.gz /haskell-src-meta-0.7.0.1.tar.gz
/hledger-1.2.tar.gz /hledger-1.2.tar.gz
/here-1.2.9.tar.gz /here-1.2.9.tar.gz
/hledger-1.4.tar.gz

View File

@ -4,39 +4,42 @@
%global pkg_name hledger %global pkg_name hledger
%global pkgver %{pkg_name}-%{version} %global pkgver %{pkg_name}-%{version}
%global here here-1.2.9 %global here here-1.2.12
# here needs %global haskellsrcmeta haskell-src-meta-0.8.0.1
%global haskellsrcmeta haskell-src-meta-0.7.0.1 %global thexpandsyns th-expand-syns-0.4.4.0
%global thexpandsyns th-expand-syns-0.4.3.0
%global thlift th-lift-0.7.7 %global thlift th-lift-0.7.7
%global thliftinstances th-lift-instances-0.1.11 %global thliftinstances th-lift-instances-0.1.11
%global thorphans th-orphans-0.13.3 %global thorphans th-orphans-0.13.4
%global threifymany th-reify-many-0.1.6 %global threifymany th-reify-many-0.1.8
%global subpkgs %{thexpandsyns} %{thlift} %{thliftinstances} %{threifymany} %{thorphans} %{haskellsrcmeta} %{here} %global utilityht utility-ht-0.0.14
%global subpkgs %{thexpandsyns} %{thlift} %{thliftinstances} %{threifymany} %{thorphans} %{haskellsrcmeta} %{here} %{utilityht}
%bcond_with tests %bcond_with tests
Name: %{pkg_name} Name: %{pkg_name}
Version: 1.2 Version: 1.4
Release: 5%{?dist} Release: 6%{?dist}
Summary: Command-line interface for the hledger accounting tool Summary: Command-line interface for the hledger accounting tool
License: GPLv3 License: GPLv3
Url: https://hackage.haskell.org/package/%{name} Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
Source2: https://hackage.haskell.org/package/%{here}/%{here}.tar.gz Source1: https://hackage.haskell.org/package/%{here}/%{here}.tar.gz
Source3: https://hackage.haskell.org/package/%{haskellsrcmeta}/%{haskellsrcmeta}.tar.gz Source2: https://hackage.haskell.org/package/%{haskellsrcmeta}/%{haskellsrcmeta}.tar.gz
Source4: https://hackage.haskell.org/package/%{thexpandsyns}/%{thexpandsyns}.tar.gz Source3: https://hackage.haskell.org/package/%{thexpandsyns}/%{thexpandsyns}.tar.gz
Source5: https://hackage.haskell.org/package/%{thlift}/%{thlift}.tar.gz Source4: https://hackage.haskell.org/package/%{thlift}/%{thlift}.tar.gz
Source6: https://hackage.haskell.org/package/%{thliftinstances}/%{thliftinstances}.tar.gz Source5: https://hackage.haskell.org/package/%{thliftinstances}/%{thliftinstances}.tar.gz
Source7: https://hackage.haskell.org/package/%{thorphans}/%{thorphans}.tar.gz Source6: https://hackage.haskell.org/package/%{thorphans}/%{thorphans}.tar.gz
Source8: https://hackage.haskell.org/package/%{threifymany}/%{threifymany}.tar.gz Source7: https://hackage.haskell.org/package/%{threifymany}/%{threifymany}.tar.gz
Source8: https://hackage.haskell.org/package/%{utilityht}/%{utilityht}.tar.gz
BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-rpm-macros-extra
# Begin cabal-rpm deps: # Begin cabal-rpm deps:
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: ghc-Diff-devel
BuildRequires: ghc-HUnit-devel BuildRequires: ghc-HUnit-devel
BuildRequires: ghc-ansi-terminal-devel
BuildRequires: ghc-base-compat-devel BuildRequires: ghc-base-compat-devel
BuildRequires: ghc-bytestring-devel BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-cmdargs-devel BuildRequires: ghc-cmdargs-devel
@ -68,6 +71,7 @@ BuildRequires: ghc-time-devel
BuildRequires: ghc-transformers-devel BuildRequires: ghc-transformers-devel
BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-unordered-containers-devel
BuildRequires: ghc-utf8-string-devel BuildRequires: ghc-utf8-string-devel
#BuildRequires: ghc-utility-ht-devel
BuildRequires: ghc-wizards-devel BuildRequires: ghc-wizards-devel
%if %{with tests} %if %{with tests}
BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-devel
@ -122,13 +126,14 @@ This package provides the Haskell %{name} library development files.
%ghc_lib_subpackage %{thliftinstances} %ghc_lib_subpackage %{thliftinstances}
%ghc_lib_subpackage %{thorphans} %ghc_lib_subpackage %{thorphans}
%ghc_lib_subpackage %{threifymany} %ghc_lib_subpackage %{threifymany}
%ghc_lib_subpackage %{utilityht}
%endif %endif
%global version %{main_version} %global version %{main_version}
%prep %prep
%setup -q -a2 -a3 -a4 -a5 -a6 -a7 -a8 %setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8
cabal-tweak-drop-dep mtl-compat cabal-tweak-drop-dep mtl-compat
@ -166,7 +171,6 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/doc %{buildroot}%{_docdir}/ghc-hle
%files %files
%license LICENSE
%{_bindir}/%{name} %{_bindir}/%{name}
@ -179,6 +183,9 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/doc %{buildroot}%{_docdir}/ghc-hle
%changelog %changelog
* Wed Jan 24 2018 Jens Petersen <petersen@redhat.com> - 1.4-6
- update to 1.4
* Wed Aug 30 2017 Jens Petersen <petersen@redhat.com> - 1.2-5 * Wed Aug 30 2017 Jens Petersen <petersen@redhat.com> - 1.2-5
- no longer need to subpackage file-embed - no longer need to subpackage file-embed

10
sources
View File

@ -1,9 +1 @@
SHA512 (th-orphans-0.13.3.tar.gz) = 5adc55392c2575d885365631ec90c6f26186fcb5ccc42f0e53cace064f1bf5ce389519aa78939a6390054a3ce144484de09205147fe06cbecbc0663898b0371d SHA512 (hledger-1.4.tar.gz) = 25d4003cbfbfb672c665a5e0a2c6852df8c1ca95b8d33154376a527d27d1a7a114c00e75b5e2c8b8ac5bfe9cb7d8f8d0a410cadbf2900691e4e2b6e0645c7369
SHA512 (th-reify-many-0.1.6.tar.gz) = dccd91f4767e29a69ad81b754085040f45a6a8ce627c435f3ca3b14cd723e390df27a462f7ba74f3d652b239c2383d84305c947ccf4fb1906ddda52f9069b589
SHA512 (th-lift-0.7.7.tar.gz) = 490d349ef2985defcf58eb49686c89ab79f8f9a3e29f3edb195440fe7995ecec6b2538767855ae0a5b9f43e5b00fe0bee167513486be99c111776ab7855d37d2
SHA512 (th-lift-instances-0.1.11.tar.gz) = e4e443637c10cd21d9b6159f29ad8eb61a65bda2b625dff48ccbf1310c9abdbb1f48ff0c7e74974b78e0517db6af2889abb3c5cfeaed202c7b3efbe1c83dbc7a
SHA512 (th-expand-syns-0.4.3.0.tar.gz) = 1f1125315292e0ce2d1e4b6a85788e3d66c9e7b6a2748be742927f9ddb501c2e2032f687ba81c67140411362e218ce4a2469ff9dcc35bb4cd213cb31f171ee47
SHA512 (haskell-src-meta-0.7.0.1.tar.gz) = 3ddb66c09d1970f0c03061bca3e07d180ca8da7b7d563b7693b7c7165cd7f798c4e9e93754362a5dfcfd81a0f2e5d4f2c9364884b3ab66422d9218b02ff1a6c5
SHA512 (hledger-1.2.tar.gz) = 02e3604bea09e85a8ac409d7ff6b26b9823a28c3deb6a030d79793a2f11fe4bd627d764f5e2952b42b1fb50cc3e4cfe3502eb0495ddb7573423ca9221ae64bff
SHA512 (here-1.2.9.tar.gz) = 7aaa3ee216d2479ceb29df377c12e84dd5c0f1583311499ac3d1ea16e4ebd3a8499dd440e0e917e03e74c575189a73f671f995ad358c51e58feab2076433be2e
SHA512 (file-embed-0.0.10.tar.gz) = aa0ef37987b9f84685e064411de080d608d5b9a8c839a332fc163eb218c1a8fcb1fb9dc6bfba0033717f10252e07bb5f72183c3b64bb83488553e9b97bdf3111