build with base64-bytestring-1.0 and blaze-html-0.5
This commit is contained in:
parent
83b6ba5595
commit
7202f591e2
@ -1,4 +1,3 @@
|
||||
# cabal2spec-0.25
|
||||
# https://fedoraproject.org/wiki/Packaging:Haskell
|
||||
# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
|
||||
|
||||
@ -12,32 +11,48 @@ working with cookies, serving files, and more.
|
||||
|
||||
Name: ghc-%{pkg_name}
|
||||
Version: 7.0.0
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Summary: %{common_summary}
|
||||
|
||||
Group: System Environment/Libraries
|
||||
License: BSD
|
||||
# BEGIN cabal2spec
|
||||
URL: http://hackage.haskell.org/package/%{pkg_name}
|
||||
Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
|
||||
ExclusiveArch: %{ghc_arches}
|
||||
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
|
||||
|
||||
BuildRequires: ghc-Cabal-devel
|
||||
BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour}
|
||||
# END cabal2spec
|
||||
BuildRequires: ghc-rpm-macros
|
||||
# Begin cabal-rpm deps:
|
||||
BuildRequires: ghc-base64-bytestring-devel
|
||||
BuildRequires: ghc-blaze-html-devel
|
||||
BuildRequires: ghc-bytestring-devel
|
||||
BuildRequires: ghc-containers-devel
|
||||
BuildRequires: ghc-directory-devel
|
||||
BuildRequires: ghc-extensible-exceptions-devel
|
||||
BuildRequires: ghc-filepath-devel
|
||||
BuildRequires: ghc-hslogger-devel
|
||||
BuildRequires: ghc-html-devel
|
||||
BuildRequires: ghc-monad-control-devel
|
||||
BuildRequires: ghc-mtl-devel
|
||||
BuildRequires: ghc-network-devel
|
||||
BuildRequires: ghc-old-locale-devel
|
||||
BuildRequires: ghc-old-time-devel
|
||||
BuildRequires: ghc-parsec-devel
|
||||
BuildRequires: ghc-process-devel
|
||||
BuildRequires: ghc-sendfile-devel
|
||||
BuildRequires: ghc-syb-devel
|
||||
BuildRequires: ghc-template-haskell-devel
|
||||
BuildRequires: ghc-text-devel
|
||||
BuildRequires: ghc-time-devel
|
||||
BuildRequires: ghc-transformers-devel
|
||||
BuildRequires: ghc-transformers-base-devel
|
||||
BuildRequires: ghc-unix-devel
|
||||
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
|
||||
ExclusiveArch: %{ghc_arches_with_ghci}
|
||||
# End cabal-rpm deps
|
||||
|
||||
%description
|
||||
%{common_description}
|
||||
@ -47,6 +62,7 @@ Patch2: happstack-server-7.0.0-mtl-transformers.patch
|
||||
%setup -q -n %{pkg_name}-%{version}
|
||||
%patch1 -p1 -b .1-orig~
|
||||
%patch2 -p1 -b .2-mtl~
|
||||
%patch3 -p1 -b .3-blaze-base64~
|
||||
|
||||
|
||||
%build
|
||||
@ -57,7 +73,6 @@ Patch2: happstack-server-7.0.0-mtl-transformers.patch
|
||||
%ghc_lib_install
|
||||
|
||||
|
||||
# devel subpackage
|
||||
%ghc_devel_package
|
||||
|
||||
%ghc_devel_description
|
||||
@ -70,6 +85,9 @@ Patch2: happstack-server-7.0.0-mtl-transformers.patch
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Nov 9 2012 Jens Petersen <petersen@redhat.com> - 7.0.0-6
|
||||
- build with base64-bytestring-1.0 and blaze-html-0.5
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.0.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
|
24
happstack-server-7.0.0-blaze-html-base64.patch
Normal file
24
happstack-server-7.0.0-blaze-html-base64.patch
Normal file
@ -0,0 +1,24 @@
|
||||
--- 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)
|
Loading…
Reference in New Issue
Block a user