diff --git a/hledger.spec b/hledger.spec index 4b4c2b7..525e5c3 100644 --- a/hledger.spec +++ b/hledger.spec @@ -5,22 +5,16 @@ %global pkgver %{pkg_name}-%{version} %global here here-1.2.13 -%global haskellsrcmeta haskell-src-meta-0.8.0.3 -%global thexpandsyns th-expand-syns-0.4.4.0 -%global thlift th-lift-0.7.11 -%global thliftinstances th-lift-instances-0.1.11 -%global thorphans th-orphans-0.13.6 -%global threifymany th-reify-many-0.1.8 %global utilityht utility-ht-0.0.14 %global lucid lucid-2.9.11 -%global subpkgs %{thexpandsyns} %{thlift} %{thliftinstances} %{threifymany} %{thorphans} %{haskellsrcmeta} %{here} %{utilityht} %{lucid} +%global subpkgs %{here} %{utilityht} %{lucid} %bcond_with tests Name: %{pkg_name} Version: 1.10 # can only be reset when all subpkgs bumped -Release: 12%{?dist} +Release: 13%{?dist} Summary: Command-line interface for the hledger accounting tool License: GPLv3+ @@ -28,14 +22,8 @@ Url: https://hackage.haskell.org/package/%{name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{here}/%{here}.tar.gz -Source2: https://hackage.haskell.org/package/%{haskellsrcmeta}/%{haskellsrcmeta}.tar.gz -Source3: https://hackage.haskell.org/package/%{thexpandsyns}/%{thexpandsyns}.tar.gz -Source4: https://hackage.haskell.org/package/%{thlift}/%{thlift}.tar.gz -Source5: https://hackage.haskell.org/package/%{thliftinstances}/%{thliftinstances}.tar.gz -Source6: https://hackage.haskell.org/package/%{thorphans}/%{thorphans}.tar.gz -Source7: https://hackage.haskell.org/package/%{threifymany}/%{threifymany}.tar.gz -Source8: https://hackage.haskell.org/package/%{utilityht}/%{utilityht}.tar.gz -Source9: https://hackage.haskell.org/package/%{lucid}/%{lucid}.tar.gz +Source2: https://hackage.haskell.org/package/%{utilityht}/%{utilityht}.tar.gz +Source3: https://hackage.haskell.org/package/%{lucid}/%{lucid}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -85,10 +73,8 @@ BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel %endif # End cabal-rpm deps -# for th-expand-syns -BuildRequires: ghc-syb-devel -# for haskell-src-meta -BuildRequires: ghc-haskell-src-exts-devel +# here +BuildRequires: ghc-haskell-src-meta-devel # lucid: BuildRequires: ghc-mmorph-devel @@ -129,12 +115,6 @@ This package provides the Haskell %{name} library development files. %if %{defined ghclibdir} %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} %ghc_lib_subpackage %{utilityht} %ghc_lib_subpackage %{lucid} %endif @@ -144,7 +124,7 @@ This package provides the Haskell %{name} library development files. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 +%setup -q -a1 -a2 -a3 # End cabal-rpm setup cabal-tweak-drop-dep mtl-compat @@ -199,6 +179,9 @@ install -Dp -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 %changelog +* Sun Mar 31 2019 Jens Petersen - 1.10-13 +- haskell-src-meta and th-* packaged + * Thu Feb 21 2019 Jens Petersen - 1.10-12 - update to 1.10 - subpackage lucid dep diff --git a/sources b/sources index 6aadf21..dcf96f2 100644 --- a/sources +++ b/sources @@ -1,10 +1,4 @@ -SHA512 (th-orphans-0.13.6.tar.gz) = bdc3b2fe239a29100a1daa734d962d491eae3b7304b2b5c795746c43a7fdb572a9d3ea104353b3d0353956210f4bb1b72aa4b5c55186c109096c220c9f7d46ad -SHA512 (haskell-src-meta-0.8.0.3.tar.gz) = aaa17f71f8105abca0047cfa34a941bfe8b5cffb31cf788356f1f8e7c51b446d58b9fcb343c9206746b126b8360a2d0198a06400f0868382e59d9ddec312ad13 SHA512 (here-1.2.13.tar.gz) = aa6ddfad039a90950389c50699dd5f7230bd1ac9b2b9345d5d0c8e8470707216093553dfe89480c31f19374b905e319b8216b8939051278ae41d79ccc5b160fb -SHA512 (th-reify-many-0.1.8.tar.gz) = cea205dea58bbca997c35c2d1bc5def46f415f5a35582913aef212b4b4f0ec7646fb425d94db4c4880b3a6ad7360f116dec7ad670fbee04c3d3e8ec520b18721 -SHA512 (th-expand-syns-0.4.4.0.tar.gz) = dbad14fbc9a2041493ee181b376f5888c5bfa8f3d64abf009ad9ee7ac3d95495899fadb678d293f4db4d9902cbc525cadb06c728762d443a035c33519452a27e SHA512 (utility-ht-0.0.14.tar.gz) = 57e4f3fef2770c9906d4003b3a8182ecf875d19f155757752a2e4d0695c5c4be3c9d87da5774e802c1774a6d8ae4ca64e8f924146169af26501a9d77dbb0f762 -SHA512 (th-lift-instances-0.1.11.tar.gz) = e4e443637c10cd21d9b6159f29ad8eb61a65bda2b625dff48ccbf1310c9abdbb1f48ff0c7e74974b78e0517db6af2889abb3c5cfeaed202c7b3efbe1c83dbc7a SHA512 (hledger-1.10.tar.gz) = 45beedfb3db6cf83c06845878759b3f636404b0fab1c1bda3cda09c03f8d79ac2cce237c97a2d934860dfe3a8a1e30e3facdd63f5100954f6148d5768977078a SHA512 (lucid-2.9.11.tar.gz) = af204378db877d01822cc7ee04482f86eb99fbed290bdf87618b8ed502db09183b8326a18199c2c45c642da548687283737798676cfc199fb5bc282455eed102 -SHA512 (th-lift-0.7.11.tar.gz) = 7ca3694602cd632e0e177a52f680c21113b696583d8d7242effef1a92959118cecdefa8cb059ca3eba9888d6c179bf9b70463695d8c8e5103ca1716eb0e01fa6