diff --git a/.gitignore b/.gitignore index c506537..58dc6df 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,11 @@ /hledger-0.27.1.tar.gz /file-embed-0.0.10.tar.gz /hledger-1.0.1.tar.gz +/th-orphans-0.13.3.tar.gz +/th-reify-many-0.1.6.tar.gz +/th-lift-0.7.7.tar.gz +/th-lift-instances-0.1.11.tar.gz +/th-expand-syns-0.4.3.0.tar.gz +/haskell-src-meta-0.7.0.1.tar.gz +/hledger-1.2.tar.gz +/here-1.2.9.tar.gz diff --git a/hledger.spec b/hledger.spec index a143f5c..1e9ae9e 100644 --- a/hledger.spec +++ b/hledger.spec @@ -4,13 +4,22 @@ %global pkg_name hledger %global pkgver %{pkg_name}-%{version} +# https://bugzilla.redhat.com/show_bug.cgi?id=1426896 %global fileembed file-embed-0.0.10 -%global subpkgs %{fileembed} +%global here here-1.2.9 +# here needs +%global haskellsrcmeta haskell-src-meta-0.7.0.1 +%global thexpandsyns th-expand-syns-0.4.3.0 +%global thlift th-lift-0.7.7 +%global thliftinstances th-lift-instances-0.1.11 +%global thorphans th-orphans-0.13.3 +%global threifymany th-reify-many-0.1.6 +%global subpkgs %{fileembed} %{thexpandsyns} %{thlift} %{thliftinstances} %{threifymany} %{thorphans} %{haskellsrcmeta} %{here} %bcond_with tests Name: %{pkg_name} -Version: 1.0.1 +Version: 1.2 Release: 1%{?dist} Summary: Command-line interface for the hledger accounting tool @@ -18,6 +27,13 @@ License: GPLv3 Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{fileembed}/%{fileembed}.tar.gz +Source2: https://hackage.haskell.org/package/%{here}/%{here}.tar.gz +Source3: https://hackage.haskell.org/package/%{haskellsrcmeta}/%{haskellsrcmeta}.tar.gz +Source4: https://hackage.haskell.org/package/%{thexpandsyns}/%{thexpandsyns}.tar.gz +Source5: https://hackage.haskell.org/package/%{thlift}/%{thlift}.tar.gz +Source6: https://hackage.haskell.org/package/%{thliftinstances}/%{thliftinstances}.tar.gz +Source7: https://hackage.haskell.org/package/%{thorphans}/%{thorphans}.tar.gz +Source8: https://hackage.haskell.org/package/%{threifymany}/%{threifymany}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra @@ -35,6 +51,7 @@ BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-haskeline-devel +#BuildRequires: ghc-here-devel BuildRequires: ghc-hledger-lib-devel BuildRequires: ghc-megaparsec-devel BuildRequires: ghc-mtl-devel @@ -95,13 +112,20 @@ This package provides the Haskell %{name} library development files. %if %{defined ghclibdir} %ghc_lib_subpackage %{fileembed} +%ghc_lib_subpackage %{here} +%ghc_lib_subpackage %{haskellsrcmeta} +%ghc_lib_subpackage %{thexpandsyns} +%ghc_lib_subpackage %{thlift} +%ghc_lib_subpackage %{thliftinstances} +%ghc_lib_subpackage %{thorphans} +%ghc_lib_subpackage %{threifymany} %endif %global version %{main_version} %prep -%setup -q -a1 +%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 cabal-tweak-drop-dep mtl-compat @@ -113,7 +137,7 @@ cabal-tweak-drop-dep mtl-compat %install %ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_rpath %{subpkgs} +%ghc_fix_rpath %{pkgver} mkdir -p %{buildroot}%{_docdir}/ghc-hledger-devel/ mv %{buildroot}%{_datadir}/%{name}-%{version}/doc %{buildroot}%{_docdir}/ghc-hledger-devel/ @@ -145,6 +169,10 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/doc %{buildroot}%{_docdir}/ghc-hle %changelog +* Fri May 26 2017 Jens Petersen - 1.2-1 +- update to 1.2 +- add here lib and its deps + * Tue Feb 21 2017 Jens Petersen - 1.0.1-1 - update to 1.0.1 - subpackage file-embed diff --git a/sources b/sources index 487c6e5..9eebb83 100644 --- a/sources +++ b/sources @@ -1,2 +1,9 @@ +SHA512 (th-orphans-0.13.3.tar.gz) = 5adc55392c2575d885365631ec90c6f26186fcb5ccc42f0e53cace064f1bf5ce389519aa78939a6390054a3ce144484de09205147fe06cbecbc0663898b0371d +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 -SHA512 (hledger-1.0.1.tar.gz) = 5f7a92ba558f72b55974d385f8c5535cf2b5ac0bf5440fde61bd1b33ce96770fc7a89726e3e83fa26050fad91f3a708972fb025d31d0e0238e0e8daaaa8bebf4