use license macro; build with network-uri

This commit is contained in:
Jens Petersen 2015-09-18 11:04:08 +09:00
parent d0a18fadb0
commit 598715f2c0

View File

@ -8,7 +8,7 @@
Name: ghc-%{pkg_name} Name: ghc-%{pkg_name}
Version: 0.8.0.1 Version: 0.8.0.1
Release: 4%{?dist} Release: 5%{?dist}
Summary: Conversion between formats used to represent mathematics Summary: Conversion between formats used to represent mathematics
License: GPLv2+ License: GPLv2+
@ -20,7 +20,7 @@ BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps: # Begin cabal-rpm deps:
BuildRequires: ghc-containers-devel BuildRequires: ghc-containers-devel
BuildRequires: ghc-mtl-devel BuildRequires: ghc-mtl-devel
BuildRequires: ghc-network-devel BuildRequires: ghc-network-uri-devel
BuildRequires: ghc-pandoc-types-devel BuildRequires: ghc-pandoc-types-devel
BuildRequires: ghc-parsec-devel BuildRequires: ghc-parsec-devel
BuildRequires: ghc-syb-devel BuildRequires: ghc-syb-devel
@ -61,7 +61,6 @@ This package provides the Haskell %{pkg_name} library development files.
%prep %prep
%setup -q -n %{pkg_name}-%{version} %setup -q -n %{pkg_name}-%{version}
cabal-tweak-flag network-uri False
%build %build
@ -71,12 +70,13 @@ cabal-tweak-flag network-uri False
%install %install
%ghc_lib_install %ghc_lib_install
rm %{buildroot}%{ghc_pkgdocdir}/LICENSE
%check %check
%ifarch aarch64 %if %{with tests}
LANG=en_US.utf8 %cabal test
%endif %endif
%cabal_test
%post devel %post devel
@ -88,7 +88,7 @@ LANG=en_US.utf8
%files -f %{name}.files %files -f %{name}.files
%doc LICENSE %license LICENSE
%files devel -f %{name}-devel.files %files devel -f %{name}-devel.files
@ -96,6 +96,10 @@ LANG=en_US.utf8
%changelog %changelog
* Fri Sep 18 2015 Jens Petersen <petersen@redhat.com> - 0.8.0.1-5
- use license macro
- build with network-uri
* Mon Aug 31 2015 Peter Robinson <pbrobinson@fedoraproject.org> 0.8.0.1-4 * Mon Aug 31 2015 Peter Robinson <pbrobinson@fedoraproject.org> 0.8.0.1-4
- Rebuild (aarch64 vector hashes) - Rebuild (aarch64 vector hashes)