diff --git a/.gitignore b/.gitignore index 92bbe52..803265b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,8 @@ /th-orphans-0.13.4.tar.gz /th-reify-many-0.1.8.tar.gz /utility-ht-0.0.14.tar.gz +/hledger-1.5.tar.gz +/th-orphans-0.13.6.tar.gz +/th-lift-0.7.10.tar.gz +/haskell-src-meta-0.8.0.3.tar.gz +/here-1.2.13.tar.gz diff --git a/hledger.spec b/hledger.spec index c5d29e5..f9a2262 100644 --- a/hledger.spec +++ b/hledger.spec @@ -1,15 +1,15 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name hledger %global pkgver %{pkg_name}-%{version} -%global here here-1.2.12 -%global haskellsrcmeta haskell-src-meta-0.8.0.1 +%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.7 +%global thlift th-lift-0.7.10 %global thliftinstances th-lift-instances-0.1.11 -%global thorphans th-orphans-0.13.4 +%global thorphans th-orphans-0.13.6 %global threifymany th-reify-many-0.1.8 %global utilityht utility-ht-0.0.14 %global subpkgs %{thexpandsyns} %{thlift} %{thliftinstances} %{threifymany} %{thorphans} %{haskellsrcmeta} %{here} %{utilityht} @@ -17,12 +17,12 @@ %bcond_with tests Name: %{pkg_name} -Version: 1.4 +Version: 1.5 # can only be reset when all subpkgs bumped -Release: 8%{?dist} +Release: 9%{?dist} Summary: Command-line interface for the hledger accounting tool -License: GPLv3 +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/%{here}/%{here}.tar.gz @@ -38,6 +38,7 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: BuildRequires: chrpath +BuildRequires: ghc-Decimal-devel BuildRequires: ghc-Diff-devel BuildRequires: ghc-HUnit-devel BuildRequires: ghc-ansi-terminal-devel @@ -137,7 +138,6 @@ This package provides the Haskell %{name} library development files. %setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 cabal-tweak-drop-dep mtl-compat -cabal-tweak-dep-ver megaparsec '< 6.2' '< 6.4' %build @@ -151,8 +151,8 @@ cabal-tweak-dep-ver megaparsec '< 6.2' '< 6.4' %ghc_fix_rpath %{pkgver} mv %{buildroot}%{_ghclicensedir}/{,ghc-}%{name} -mkdir -p %{buildroot}%{_docdir}/ghc-hledger-devel/ -mv %{buildroot}%{_datadir}/%{name}-%{version}/doc %{buildroot}%{_docdir}/ghc-hledger-devel/ +install -Dp -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 +rm -r %{buildroot}%{_datadir}/%{pkgver}/{hledger.*,.otherdocs} %check @@ -169,6 +169,7 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/doc %{buildroot}%{_docdir}/ghc-hle %files %{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* %files -n ghc-%{name} -f ghc-%{name}.files @@ -176,10 +177,14 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/doc %{buildroot}%{_docdir}/ghc-hle %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files -%doc CHANGES README.md doc +%doc CHANGES README.md %changelog +* Sun Jul 22 2018 Jens Petersen - 1.5-9 +- update to 1.5 +- add main manpage + * Fri Jul 13 2018 Fedora Release Engineering - 1.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 91236eb..d9cd577 100644 --- a/sources +++ b/sources @@ -1,9 +1,9 @@ -SHA512 (haskell-src-meta-0.8.0.1.tar.gz) = 5adcb205c45fe68ec99dc7c0c1a0ddd153146d6602eeb3dff9b2e0203f6ffcb5c5925c300b06f7c91a9914fe7a99bb48a1031468512ee38cd19dd31d819e4600 -SHA512 (here-1.2.12.tar.gz) = 0f1dc6912f7d3f4b309aba3443c365fb97d9a1b01f55f8ae605e55193253f475412f759e9445de1ed310b0817ba09673ee0c7fd3553a1d21e1c8f137d906ede1 -SHA512 (hledger-1.4.tar.gz) = 25d4003cbfbfb672c665a5e0a2c6852df8c1ca95b8d33154376a527d27d1a7a114c00e75b5e2c8b8ac5bfe9cb7d8f8d0a410cadbf2900691e4e2b6e0645c7369 -SHA512 (th-expand-syns-0.4.4.0.tar.gz) = dbad14fbc9a2041493ee181b376f5888c5bfa8f3d64abf009ad9ee7ac3d95495899fadb678d293f4db4d9902cbc525cadb06c728762d443a035c33519452a27e -SHA512 (th-lift-0.7.7.tar.gz) = 490d349ef2985defcf58eb49686c89ab79f8f9a3e29f3edb195440fe7995ecec6b2538767855ae0a5b9f43e5b00fe0bee167513486be99c111776ab7855d37d2 -SHA512 (th-lift-instances-0.1.11.tar.gz) = e4e443637c10cd21d9b6159f29ad8eb61a65bda2b625dff48ccbf1310c9abdbb1f48ff0c7e74974b78e0517db6af2889abb3c5cfeaed202c7b3efbe1c83dbc7a -SHA512 (th-orphans-0.13.4.tar.gz) = 66707368ac9649802dec954b6c5867b380b275b407c1f2d8db79bcf178a212b8f5e50b8f9f73edb4a09619b3097f6663007f9f4aaf0f33d15102cf80fb883eb4 +SHA512 (th-orphans-0.13.6.tar.gz) = bdc3b2fe239a29100a1daa734d962d491eae3b7304b2b5c795746c43a7fdb572a9d3ea104353b3d0353956210f4bb1b72aa4b5c55186c109096c220c9f7d46ad +SHA512 (th-lift-0.7.10.tar.gz) = be94248f344a82441ab71225cf2a88f0a2e6bc603e63ff535c5484f60e5797871658a1824860c7336c9c5b4b987f6a8a42e911d1103794e544274b3de85eeb4a +SHA512 (haskell-src-meta-0.8.0.3.tar.gz) = aaa17f71f8105abca0047cfa34a941bfe8b5cffb31cf788356f1f8e7c51b446d58b9fcb343c9206746b126b8360a2d0198a06400f0868382e59d9ddec312ad13 +SHA512 (here-1.2.13.tar.gz) = aa6ddfad039a90950389c50699dd5f7230bd1ac9b2b9345d5d0c8e8470707216093553dfe89480c31f19374b905e319b8216b8939051278ae41d79ccc5b160fb +SHA512 (hledger-1.5.tar.gz) = 252c515c1cec094266888ae6ba8ebc166abbfe0b2681b4f0cca07e3b21488f6ce36a2ac5ffa4a7629414c1720c73016b8a45921c4c336923b21bb15352630c39 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