From 598715f2c040ca5f26ba397984331e46d25c15ca Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 18 Sep 2015 11:04:08 +0900 Subject: [PATCH] use license macro; build with network-uri --- ghc-texmath.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ghc-texmath.spec b/ghc-texmath.spec index f49a2d7..bf88f49 100644 --- a/ghc-texmath.spec +++ b/ghc-texmath.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.8.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Conversion between formats used to represent mathematics License: GPLv2+ @@ -20,7 +20,7 @@ BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-containers-devel BuildRequires: ghc-mtl-devel -BuildRequires: ghc-network-devel +BuildRequires: ghc-network-uri-devel BuildRequires: ghc-pandoc-types-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-syb-devel @@ -61,7 +61,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -cabal-tweak-flag network-uri False %build @@ -71,12 +70,13 @@ cabal-tweak-flag network-uri False %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %check -%ifarch aarch64 -LANG=en_US.utf8 +%if %{with tests} +%cabal test %endif -%cabal_test %post devel @@ -88,7 +88,7 @@ LANG=en_US.utf8 %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files @@ -96,6 +96,10 @@ LANG=en_US.utf8 %changelog +* Fri Sep 18 2015 Jens Petersen - 0.8.0.1-5 +- use license macro +- build with network-uri + * Mon Aug 31 2015 Peter Robinson 0.8.0.1-4 - Rebuild (aarch64 vector hashes)