Reverting "use license macro; build with network-uri"

This reverts commit 598715f2c0.
This commit is contained in:
Jens Petersen 2016-02-02 01:16:40 +09:00
parent c3fa1f0b39
commit 5cdd12332e

View File

@ -8,7 +8,7 @@
Name: ghc-%{pkg_name}
Version: 0.8.0.1
Release: 5%{?dist}
Release: 4%{?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-uri-devel
BuildRequires: ghc-network-devel
BuildRequires: ghc-pandoc-types-devel
BuildRequires: ghc-parsec-devel
BuildRequires: ghc-syb-devel
@ -61,6 +61,7 @@ This package provides the Haskell %{pkg_name} library development files.
%prep
%setup -q -n %{pkg_name}-%{version}
cabal-tweak-flag network-uri False
%build
@ -70,13 +71,12 @@ This package provides the Haskell %{pkg_name} library development files.
%install
%ghc_lib_install
rm %{buildroot}%{ghc_pkgdocdir}/LICENSE
%check
%if %{with tests}
%cabal test
%ifarch aarch64
LANG=en_US.utf8
%endif
%cabal_test
%post devel
@ -88,7 +88,7 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE
%files -f %{name}.files
%license LICENSE
%doc LICENSE
%files devel -f %{name}-devel.files
@ -96,10 +96,6 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE
%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
- Rebuild (aarch64 vector hashes)