patch is for the wrong spec...
This commit is contained in:
parent
5a9be34aa1
commit
f9e3c76288
|
@ -1,13 +0,0 @@
|
|||
diff --git a/wizards.cabal b/wizards.cabal
|
||||
index 29b9a71..19e4382 100644
|
||||
--- a/wizards.cabal
|
||||
+++ b/wizards.cabal
|
||||
@@ -83,7 +83,7 @@ Library
|
||||
Extensions: OverlappingInstances
|
||||
|
||||
-- Packages needed in order to build this package.
|
||||
- Build-depends: base == 4.*, haskeline >= 0.6 && < 0.8, mtl >= 2.0 && < 2.3, transformers >= 0.1 && < 0.5, control-monad-free ==0.5.*, containers >= 0.4 && < 0.6
|
||||
+ Build-depends: base == 4.*, haskeline >= 0.6 && < 0.8, mtl >= 2.0 && < 2.3, transformers >= 0.1 && < 0.5, control-monad-free >= 0.5 && < 0.7, containers >= 0.4 && < 0.6
|
||||
|
||||
-- Modules not exported by this package.
|
||||
-- Other-modules:
|
|
@ -4,16 +4,13 @@
|
|||
|
||||
Name: ghc-%{pkg_name}
|
||||
Version: 0.6.1
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Free monads and monad transformers
|
||||
|
||||
License: Public Domain
|
||||
Url: https://hackage.haskell.org/package/%{pkg_name}
|
||||
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
|
||||
|
||||
# https://github.com/liamoc/wizards/commit/694ffef6034f6647b5f74ed07e8f3d5e7f4a46bf
|
||||
Patch0: 0001-Bump-upper-bound-on-control-monad-free.patch
|
||||
|
||||
BuildRequires: ghc-Cabal-devel
|
||||
BuildRequires: ghc-rpm-macros
|
||||
# Begin cabal-rpm deps:
|
||||
|
@ -46,8 +43,6 @@ files.
|
|||
%prep
|
||||
%setup -q -n %{pkg_name}-%{version}
|
||||
|
||||
%patch0 -p1 -b .cmf-bump
|
||||
|
||||
|
||||
%build
|
||||
%ghc_lib_build
|
||||
|
@ -72,6 +67,9 @@ files.
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Feb 27 2015 Ben Boeckel <mathstuf@gmail.com> - 0.6.1-3
|
||||
- patch is for the wrong spec...
|
||||
|
||||
* Thu Feb 26 2015 Ben Boeckel <mathstuf@gmail.com> - 0.6.1-2
|
||||
- cherry-pick patch to support control-monad-free 0.6
|
||||
|
||||
|
|
Loading…
Reference in New Issue