From 704c3591d5f750d7349f5a62e7dd95a6dac08cb5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 21 Feb 2018 19:15:04 +0900 Subject: [PATCH] fix build on epel7 ghc --- cabal-rpm-0.12-Stackage-fmap.patch | 21 +++++++++++++++++++++ cabal-rpm.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 cabal-rpm-0.12-Stackage-fmap.patch diff --git a/cabal-rpm-0.12-Stackage-fmap.patch b/cabal-rpm-0.12-Stackage-fmap.patch new file mode 100644 index 0000000..3329839 --- /dev/null +++ b/cabal-rpm-0.12-Stackage-fmap.patch @@ -0,0 +1,21 @@ +commit 0ea6b9747cd226f4eccb926fcbb170b0a7b8dfa6 +Author: Jens Petersen +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 + diff --git a/cabal-rpm.spec b/cabal-rpm.spec index 9696c08..2bdccaf 100644 --- a/cabal-rpm.spec +++ b/cabal-rpm.spec @@ -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 - 0.12.1-4 +- fix build on epel7 ghc + * Wed Feb 21 2018 Jens Petersen - 0.12.1-3 - add bcond for https