From 4d252bad9ed10e0af92ffa3efe4919c89965207a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Feb 2017 00:02:06 +0900 Subject: [PATCH] update to 1.0.1; subpackage file-embed --- .gitignore | 1 + hledger.spec | 49 +++++++++++++++++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 3e452f9..e3728bf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /hledger-0.23.2.tar.gz /hledger-0.24.tar.gz /hledger-0.27.1.tar.gz +/hledger-1.1.tar.gz diff --git a/hledger.spec b/hledger.spec index 90ef74f..121e737 100644 --- a/hledger.spec +++ b/hledger.spec @@ -1,18 +1,23 @@ -# generated by cabal-rpm-0.10.0 +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name hledger +%global pkgver %{pkg_name}-%{version} + +%global fileembed file-embed-0.0.10 +%global subpkgs %{fileembed} %bcond_with tests Name: %{pkg_name} -Version: 0.27.1 -Release: 2%{?dist} -Summary: The main command-line interface for the hledger accounting tool +Version: 1.0.1 +Release: 1%{?dist} +Summary: Command-line interface for the hledger accounting tool License: GPLv3 Url: https://hackage.haskell.org/package/%{name} -Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{fileembed}/%{fileembed}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -20,14 +25,18 @@ BuildRequires: ghc-rpm-macros BuildRequires: chrpath BuildRequires: ghc-HUnit-devel BuildRequires: ghc-base-compat-devel +BuildRequires: ghc-bytestring-devel BuildRequires: ghc-cmdargs-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-csv-devel +BuildRequires: ghc-data-default-devel BuildRequires: ghc-directory-devel +#BuildRequires: ghc-file-embed-devel BuildRequires: ghc-filepath-devel +BuildRequires: ghc-hashable-devel BuildRequires: ghc-haskeline-devel BuildRequires: ghc-hledger-lib-devel -#BuildRequires: ghc-mtl-compat-devel +BuildRequires: ghc-megaparsec-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-old-time-devel BuildRequires: ghc-parsec-devel @@ -38,9 +47,11 @@ BuildRequires: ghc-safe-devel BuildRequires: ghc-shakespeare-devel BuildRequires: ghc-split-devel BuildRequires: ghc-tabular-devel +BuildRequires: ghc-temporary-devel BuildRequires: ghc-terminfo-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel +BuildRequires: ghc-transformers-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-utf8-string-devel BuildRequires: ghc-wizards-devel @@ -51,8 +62,9 @@ BuildRequires: ghc-test-framework-hunit-devel # End cabal-rpm deps %description -This is hledger’s command-line interface. Its basic function is to read a plain +This is hledger's command-line interface. Its basic function is to read a plain text file describing financial transactions and produce useful reports. + hledger is a cross-platform program for tracking money, time, or any other commodity, using double-entry accounting and a simple, editable file format. It is inspired by and largely compatible with ledger(1). hledger provides @@ -79,19 +91,32 @@ Requires: ghc-%{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{name} library development files. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{fileembed} +%endif + +%global version %{main_version} + + %prep -%setup -q +%setup -q -a1 cabal-tweak-drop-dep mtl-compat %build +%ghc_libs_build %{subpkgs} %ghc_lib_build %install +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{subpkgs} -%ghc_fix_dynamic_rpath %{pkg_name} +mkdir -p %{buildroot}%{_docdir}/ghc-hledger-devel/ +mv %{buildroot}%{_datadir}/%{name}-%{version}/doc %{buildroot}%{_docdir}/ghc-hledger-devel/ %check @@ -116,10 +141,14 @@ cabal-tweak-drop-dep mtl-compat %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files -%doc CHANGES README.md +%doc CHANGES README.md doc %changelog +* Tue Feb 21 2017 Jens Petersen - 1.0.1-1 +- update to 1.0.1 +- subpackage file-embed + * Fri Feb 10 2017 Fedora Release Engineering - 0.27.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index a09eb73..774ecc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1134221dcfb33f5431d0084f074fcf93 hledger-0.27.1.tar.gz +SHA512 (hledger-1.1.tar.gz) = e4b5b8a1af7dfb150afbb06e7274091c00b4dc5d22e3270d59245baaf79b70c51421d23b64e4242d03ca14e0a78859a7dd3ae0ddb0d14a02d004ba0bb79bdc04