diff --git a/.gitignore b/.gitignore index a89a2ce..fdf940c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /here-1.2.13.tar.gz /hledger-1.10.tar.gz /lucid-2.9.11.tar.gz +/base-compat-batteries-0.10.1.tar.gz diff --git a/hledger.spec b/hledger.spec index 1ff48b1..bae00b4 100644 --- a/hledger.spec +++ b/hledger.spec @@ -13,7 +13,8 @@ %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 basecompatbatteries base-compat-batteries-0.10.1 +%global subpkgs %{thexpandsyns} %{thlift} %{thliftinstances} %{threifymany} %{thorphans} %{haskellsrcmeta} %{here} %{utilityht} %{lucid} %{basecompatbatteries} %bcond_with tests @@ -36,6 +37,7 @@ Source6: https://hackage.haskell.org/package/%{thorphans}/%{thorphans}.ta 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 +Source10: https://hackage.haskell.org/package/%{basecompatbatteries}/%{basecompatbatteries}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -46,7 +48,7 @@ BuildRequires: ghc-Decimal-devel BuildRequires: ghc-Diff-devel BuildRequires: ghc-HUnit-devel BuildRequires: ghc-ansi-terminal-devel -BuildRequires: ghc-base-compat-batteries-devel +#BuildRequires: ghc-base-compat-batteries-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-cmdargs-devel BuildRequires: ghc-containers-devel @@ -135,6 +137,7 @@ This package provides the Haskell %{name} library development files. %ghc_lib_subpackage %{threifymany} %ghc_lib_subpackage %{utilityht} %ghc_lib_subpackage %{lucid} +%ghc_lib_subpackage %{basecompatbatteries} %endif %global version %{main_version} @@ -142,7 +145,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 -a4 -a5 -a6 -a7 -a8 -a9 -a10 # End cabal-rpm setup cabal-tweak-drop-dep mtl-compat @@ -199,7 +202,7 @@ install -Dp -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 %changelog * Thu Feb 21 2019 Jens Petersen - 1.10-12 - update to 1.10 -- subpackage lucid dep +- subpackage base-compat-batteries and lucid deps * Fri Feb 01 2019 Fedora Release Engineering - 1.5-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index cbac385..4f608dc 100644 --- a/sources +++ b/sources @@ -8,3 +8,4 @@ SHA512 (utility-ht-0.0.14.tar.gz) = 57e4f3fef2770c9906d4003b3a8182ecf875d19f1557 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 (base-compat-batteries-0.10.1.tar.gz) = 7fc65b961b3b6bde315cf0d26fdcbbb0712af930cfb643b8f8ecba8ee02f9a7d0ba014a10014bdf38b688f2e4d1ccbcaa8cab445f64975afb7fee3e7f632bcb9