fix build on epel7 ghc

This commit is contained in:
Jens Petersen 2018-02-21 19:15:04 +09:00
parent 6dfa22b3fc
commit 704c3591d5
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,21 @@
commit 0ea6b9747cd226f4eccb926fcbb170b0a7b8dfa6
Author: Jens Petersen <petersen@redhat.com>
Date: Wed Feb 21 18:59:11 2018 +0900
Stackage: import <$> for older ghc
diff --git a/src/Stackage.hs b/src/Stackage.hs
index b20d976..2da3f73 100644
--- a/src/Stackage.hs
+++ b/src/Stackage.hs
@@ -32,6 +32,10 @@ import Network.HTTP.Client.TLS
import System.FilePath
import SysCmd ((+-+))
#else
+#if (defined(MIN_VERSION_base) && MIN_VERSION_base(4,8,2))
+#else
+import Control.Applicative ((<$>))
+#endif
import SysCmd ((+-+), cmdMaybe, optionalProgram)
#endif

View File

@ -9,13 +9,14 @@
Name: cabal-rpm
Version: 0.12.1
Release: 3%{?dist}
Release: 4%{?dist}
Summary: RPM packaging tool for Haskell Cabal-based packages
License: GPLv3+
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
Source1: cblrpm.1
Patch0: cabal-rpm-0.12-Stackage-fmap.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@ -66,6 +67,7 @@ current cabal-rpm packaging.
%prep
%setup -q
%patch0 -p1 -b .orig
%build
@ -90,6 +92,9 @@ ln -s %{name} %{buildroot}%{_bindir}/cblrpm
%changelog
* Wed Feb 21 2018 Jens Petersen <petersen@redhat.com> - 0.12.1-4
- fix build on epel7 ghc
* Wed Feb 21 2018 Jens Petersen <petersen@redhat.com> - 0.12.1-3
- add bcond for https