revert to 7.0.0 and allow building with mtl-2.1 and transformers-0.3
This commit is contained in:
parent
6667853092
commit
01d7c2a203
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,3 +1 @@
|
||||
/happstack-server-7.0.0.tar.gz
|
||||
/happstack-server-7.0.2.tar.gz
|
||||
/happstack-server-7.0.1.tar.gz
|
||||
|
@ -11,8 +11,8 @@ for routing requests, handling query parameters, generating responses,\
|
||||
working with cookies, serving files, and more.
|
||||
|
||||
Name: ghc-%{pkg_name}
|
||||
Version: 7.0.1
|
||||
Release: 1%{?dist}
|
||||
Version: 7.0.0
|
||||
Release: 3%{?dist}
|
||||
Summary: %{common_summary}
|
||||
|
||||
Group: System Environment/Libraries
|
||||
@ -37,6 +37,7 @@ BuildRequires: ghc-utf8-string-devel
|
||||
BuildRequires: ghc-xhtml-devel
|
||||
BuildRequires: ghc-zlib-devel
|
||||
Patch1: happstack-server-default-to-base4.patch
|
||||
Patch2: happstack-server-7.0.0-mtl-transformers.patch
|
||||
|
||||
%description
|
||||
%{common_description}
|
||||
@ -44,7 +45,8 @@ Patch1: happstack-server-default-to-base4.patch
|
||||
|
||||
%prep
|
||||
%setup -q -n %{pkg_name}-%{version}
|
||||
%patch1 -p1 -b .orig
|
||||
%patch1 -p1 -b .1-orig~
|
||||
%patch2 -p1 -b .2-mtl~
|
||||
|
||||
|
||||
%build
|
||||
@ -68,8 +70,8 @@ Patch1: happstack-server-default-to-base4.patch
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 11 2012 Jens Petersen <petersen@redhat.com> - 7.0.1-1
|
||||
- update to 7.0.1
|
||||
* Mon Jun 11 2012 Jens Petersen <petersen@redhat.com> - 7.0.0-3
|
||||
- allow building with mtl-2.1 and transformers-0.3
|
||||
|
||||
* Mon May 7 2012 Jens Petersen <petersen@redhat.com> - 7.0.0-2
|
||||
- turn on base4 flag
|
||||
|
21
happstack-server-7.0.0-mtl-transformers.patch
Normal file
21
happstack-server-7.0.0-mtl-transformers.patch
Normal file
@ -0,0 +1,21 @@
|
||||
diff -u happstack-server-7.0.0/happstack-server.cabal\~ happstack-server-7.0.0/happstack-server.cabal
|
||||
--- happstack-server-7.0.0/happstack-server.cabal~ 2012-06-11 10:11:06.088763957 +0900
|
||||
+++ happstack-server-7.0.0/happstack-server.cabal 2012-06-11 10:17:14.556914595 +0900
|
||||
@@ -88,7 +88,7 @@
|
||||
hslogger >= 1.0.2,
|
||||
html,
|
||||
monad-control >= 0.3 && < 0.4,
|
||||
- mtl >= 2 && < 2.1,
|
||||
+ mtl >= 2 && < 2.2,
|
||||
old-locale,
|
||||
old-time,
|
||||
parsec < 4,
|
||||
@@ -97,7 +97,7 @@
|
||||
template-haskell,
|
||||
text >= 0.10 && < 0.12,
|
||||
time,
|
||||
- transformers >= 0.1.3 && < 0.3,
|
||||
+ transformers >= 0.1.3 && < 0.4,
|
||||
transformers-base >= 0.4 && < 0.5,
|
||||
utf8-string >= 0.3.4 && < 0.4,
|
||||
xhtml,
|
Loading…
Reference in New Issue
Block a user