[ghc-happstack-server] revert to 7.0.0 and allow building with mtl-2.1 and transformers-0.3
Jens Petersen
petersen at fedoraproject.org
Mon Jun 11 01:21:12 UTC 2012
commit 01d7c2a2034d6063ed083a21adae8bd4c4237790
Author: Jens Petersen <petersen at redhat.com>
Date: Mon Jun 11 10:21:01 2012 +0900
revert to 7.0.0 and allow building with mtl-2.1 and transformers-0.3
.gitignore | 2 --
ghc-happstack-server.spec | 12 +++++++-----
happstack-server-7.0.0-mtl-transformers.patch | 21 +++++++++++++++++++++
sources | 2 +-
4 files changed, 29 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38b45eb..13e6932 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
/happstack-server-7.0.0.tar.gz
-/happstack-server-7.0.2.tar.gz
-/happstack-server-7.0.1.tar.gz
diff --git a/ghc-happstack-server.spec b/ghc-happstack-server.spec
index 1b167f2..5b34ca1 100644
--- a/ghc-happstack-server.spec
+++ b/ghc-happstack-server.spec
@@ -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 at redhat.com> - 7.0.1-1
-- update to 7.0.1
+* Mon Jun 11 2012 Jens Petersen <petersen at redhat.com> - 7.0.0-3
+- allow building with mtl-2.1 and transformers-0.3
* Mon May 7 2012 Jens Petersen <petersen at redhat.com> - 7.0.0-2
- turn on base4 flag
diff --git a/happstack-server-7.0.0-mtl-transformers.patch b/happstack-server-7.0.0-mtl-transformers.patch
new file mode 100644
index 0000000..78ef99b
--- /dev/null
+++ b/happstack-server-7.0.0-mtl-transformers.patch
@@ -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,
diff --git a/sources b/sources
index 47215f7..3c47c45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99e34c88f9eda1becc73c82383cb6b06 happstack-server-7.0.1.tar.gz
+ade8cc2a071293515a1d2c85e63f71ad happstack-server-7.0.0.tar.gz
More information about the scm-commits
mailing list