update to 1.10

This commit is contained in:
Jens Petersen 2019-02-21 15:11:24 +08:00
parent ebcd5647d9
commit 4d16218212
3 changed files with 21 additions and 10 deletions

2
.gitignore vendored
View File

@ -25,3 +25,5 @@
/th-lift-0.7.10.tar.gz
/haskell-src-meta-0.8.0.3.tar.gz
/here-1.2.13.tar.gz
/hledger-1.10.tar.gz
/lucid-2.9.11.tar.gz

View File

@ -7,19 +7,20 @@
%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.10
%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 subpkgs %{thexpandsyns} %{thlift} %{thliftinstances} %{threifymany} %{thorphans} %{haskellsrcmeta} %{here} %{utilityht}
%global lucid lucid-2.9.11
%global subpkgs %{thexpandsyns} %{thlift} %{thliftinstances} %{threifymany} %{thorphans} %{haskellsrcmeta} %{here} %{utilityht} %{lucid}
%bcond_with tests
Name: %{pkg_name}
Version: 1.5
Version: 1.10
# can only be reset when all subpkgs bumped
Release: 11%{?dist}
Release: 12%{?dist}
Summary: Command-line interface for the hledger accounting tool
License: GPLv3+
@ -34,6 +35,7 @@ Source5: https://hackage.haskell.org/package/%{thliftinstances}/%{thlifti
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
# End cabal-rpm sources
# Begin cabal-rpm deps:
@ -44,7 +46,7 @@ BuildRequires: ghc-Decimal-devel
BuildRequires: ghc-Diff-devel
BuildRequires: ghc-HUnit-devel
BuildRequires: ghc-ansi-terminal-devel
BuildRequires: ghc-base-compat-devel
BuildRequires: ghc-base-compat-batteries-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-cmdargs-devel
BuildRequires: ghc-containers-devel
@ -57,6 +59,7 @@ BuildRequires: ghc-hashable-devel
BuildRequires: ghc-haskeline-devel
#BuildRequires: ghc-here-devel
BuildRequires: ghc-hledger-lib-devel
#BuildRequires: ghc-lucid-devel
BuildRequires: ghc-megaparsec-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-old-time-devel
@ -131,13 +134,15 @@ This package provides the Haskell %{name} library development files.
%ghc_lib_subpackage %{thorphans}
%ghc_lib_subpackage %{threifymany}
%ghc_lib_subpackage %{utilityht}
%ghc_lib_subpackage %{lucid}
%endif
%global version %{main_version}
%prep
%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8
# Begin cabal-rpm setup:
%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9
# End cabal-rpm setup
cabal-tweak-drop-dep mtl-compat
@ -151,12 +156,13 @@ cabal-tweak-drop-dep mtl-compat
%install
# Begin cabal-rpm install
%ghc_libs_install %{subpkgs}
%ghc_lib_install
%ghc_fix_rpath %{pkgver}
# End cabal-rpm install
install -Dp -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
rm -r %{buildroot}%{_datadir}/%{pkgver}/{hledger.*,.otherdocs}
%check
@ -176,7 +182,6 @@ rm -r %{buildroot}%{_datadir}/%{pkgver}/{hledger.*,.otherdocs}
%license LICENSE
%doc CHANGES README.md
%{_bindir}/%{name}
%{_datadir}/%{pkgver}
# End cabal-rpm files
%{_mandir}/man1/%{name}.1*
@ -184,7 +189,6 @@ rm -r %{buildroot}%{_datadir}/%{pkgver}/{hledger.*,.otherdocs}
%files -n ghc-%{name} -f ghc-%{name}.files
# Begin cabal-rpm files:
%license LICENSE
%{_datadir}/%{pkgver}
# End cabal-rpm files
@ -193,6 +197,10 @@ rm -r %{buildroot}%{_datadir}/%{pkgver}/{hledger.*,.otherdocs}
%changelog
* Thu Feb 21 2019 Jens Petersen <petersen@redhat.com> - 1.10-12
- update to 1.10
- subpackage lucid dep
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -2,8 +2,9 @@ SHA512 (th-orphans-0.13.6.tar.gz) = bdc3b2fe239a29100a1daa734d962d491eae3b7304b2
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
SHA512 (hledger-1.10.tar.gz) = 45beedfb3db6cf83c06845878759b3f636404b0fab1c1bda3cda09c03f8d79ac2cce237c97a2d934860dfe3a8a1e30e3facdd63f5100954f6148d5768977078a
SHA512 (lucid-2.9.11.tar.gz) = af204378db877d01822cc7ee04482f86eb99fbed290bdf87618b8ed502db09183b8326a18199c2c45c642da548687283737798676cfc199fb5bc282455eed102