diff --git a/ghc-happstack-server.spec b/ghc-happstack-server.spec index 34b63ab..258f215 100644 --- a/ghc-happstack-server.spec +++ b/ghc-happstack-server.spec @@ -18,8 +18,7 @@ License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz Patch1: happstack-server-default-to-base4.patch -Patch2: happstack-server-7.0.0-mtl-transformers.patch -Patch3: happstack-server-7.0.0-blaze-html-base64.patch +Patch2: happstack-server-7.0.0-blaze-html.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -61,8 +60,11 @@ ExclusiveArch: %{ghc_arches_with_ghci} %prep %setup -q -n %{pkg_name}-%{version} %patch1 -p1 -b .1-orig~ -%patch2 -p1 -b .2-mtl~ -%patch3 -p1 -b .3-blaze-base64~ +%patch2 -p1 -b .2-blaze~ + +cabal-tweak-dep-ver mtl "< 2.1" "< 2.2" +cabal-tweak-dep-ver transformers "< 0.3" "< 0.4" +cabal-tweak-dep-ver base64-bytestring "== 0.1.*" "== 1.*" %build diff --git a/happstack-server-7.0.0-blaze-html-base64.patch b/happstack-server-7.0.0-blaze-html-base64.patch deleted file mode 100644 index a463a58..0000000 --- a/happstack-server-7.0.0-blaze-html-base64.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- happstack-server-7.0.0/happstack-server.cabal~ 2012-11-09 21:06:02.966044346 +0900 -+++ happstack-server-7.0.0/happstack-server.cabal 2012-11-09 21:07:52.081366061 +0900 -@@ -78,8 +78,8 @@ Library - Paths_happstack_server - - Build-Depends: base, -- blaze-html >= 0.3 && < 0.5, -- base64-bytestring == 0.1.*, -+ blaze-html >= 0.3 && < 0.6, blaze-markup, -+ base64-bytestring == 1.*, - bytestring, - containers, - directory, -diff -up happstack-server-7.0.0/src/Happstack/Server/Response.hs~ happstack-server-7.0.0/src/Happstack/Server/Response.hs ---- happstack-server-7.0.0/src/Happstack/Server/Response.hs~ 2012-03-30 01:00:41.000000000 +0900 -+++ happstack-server-7.0.0/src/Happstack/Server/Response.hs 2012-11-09 21:18:51.040743391 +0900 -@@ -40,6 +40,7 @@ import Happstack.Server.SURI - import System.Locale (defaultTimeLocale) - import System.Time (CalendarTime, formatCalendarTime) - import qualified Text.Blaze as Blaze -+import qualified Text.Blaze.Html as Blaze - import qualified Text.Blaze.Renderer.Utf8 as Blaze - import Text.Html (Html, renderHtml) - import qualified Text.XHtml as XHtml (Html, renderHtml) diff --git a/happstack-server-7.0.0-blaze-html.patch b/happstack-server-7.0.0-blaze-html.patch new file mode 100644 index 0000000..9270c10 --- /dev/null +++ b/happstack-server-7.0.0-blaze-html.patch @@ -0,0 +1,42 @@ +diff -up happstack-server-7.0.0/happstack-server.cabal.2-blaze~ happstack-server-7.0.0/happstack-server.cabal +--- happstack-server-7.0.0/happstack-server.cabal.2-blaze~ 2012-11-10 13:04:14.796470433 +0900 ++++ happstack-server-7.0.0/happstack-server.cabal 2012-11-10 13:10:44.152465822 +0900 +@@ -78,7 +78,7 @@ Library + Paths_happstack_server + + Build-Depends: base, +- blaze-html >= 0.3 && < 0.5, ++ blaze-html >= 0.3 && < 0.6, blaze-markup, + base64-bytestring == 0.1.*, + bytestring, + containers, +@@ -88,7 +88,7 @@ Library + 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 @@ Library + 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 -up happstack-server-7.0.0/src/Happstack/Server/Response.hs.2-blaze~ happstack-server-7.0.0/src/Happstack/Server/Response.hs +--- happstack-server-7.0.0/src/Happstack/Server/Response.hs.2-blaze~ 2012-03-30 01:00:41.000000000 +0900 ++++ happstack-server-7.0.0/src/Happstack/Server/Response.hs 2012-11-10 13:04:14.798470428 +0900 +@@ -39,7 +39,7 @@ import Happstack.Server.Types + import Happstack.Server.SURI (ToSURI) + import System.Locale (defaultTimeLocale) + import System.Time (CalendarTime, formatCalendarTime) +-import qualified Text.Blaze as Blaze ++import qualified Text.Blaze.Html as Blaze + import qualified Text.Blaze.Renderer.Utf8 as Blaze + import Text.Html (Html, renderHtml) + import qualified Text.XHtml as XHtml (Html, renderHtml) diff --git a/happstack-server-7.0.0-mtl-transformers.patch b/happstack-server-7.0.0-mtl-transformers.patch deleted file mode 100644 index 78ef99b..0000000 --- a/happstack-server-7.0.0-mtl-transformers.patch +++ /dev/null @@ -1,21 +0,0 @@ -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,