rpms
/
ghc-happstack-server
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 7.1.7.1

This commit is contained in:
Jens Petersen 2014-05-08 19:25:27 +09:00
parent 21a8aedf65
commit fd78df85c9
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ghc-happstack-server.spec
View File

@ -3,13 +3,14 @@
%global pkg_name happstack-server
Name: ghc-%{pkg_name}
Version: 7.1.0
Release: 3%{?dist}
Version: 7.1.7.1
Release: 1%{?dist}
Summary: Happstack web server
Patch1: happstack-server-time-compat.patch
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
Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@ -55,6 +56,7 @@ For in-depth documentation see the Happstack Crash Course
%package devel
Summary: Haskell %{pkg_name} library development files
Provides: %{name}-static = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
Requires(postun): ghc-compiler = %{ghc_version}
@ -67,8 +69,7 @@ files.
%prep
%setup -q -n %{pkg_name}-%{version}
cabal-tweak-dep-ver blaze-html "== 0.5.*" ">= 0.5"
%patch1 -p1 -b .orig
%build

31
happstack-server-time-compat.patch Normal file
View File

@ -0,0 +1,31 @@
--- happstack-server-7.1.7.1/happstack-server.cabal~ 2014-03-11 05:29:33.000000000 +0900
+++ happstack-server-7.1.7.1/happstack-server.cabal 2014-04-02 10:20:40.665818936 +0900
@@ -88,7 +88,6 @@
syb,
text >= 0.10 && < 0.12,
time,
- time-compat,
threads >= 0.5,
transformers >= 0.1.3 && < 0.4,
transformers-base >= 0.4 && < 0.5,
--- happstack-server-7.3.4/src/Happstack/Server/FileServe/BuildingBlocks.hs~ 2014-03-11 05:29:33.000000000 +0900
+++ happstack-server-7.3.4/src/Happstack/Server/FileServe/BuildingBlocks.hs 2014-04-02 10:26:17.195355663 +0900
@@ -66,7 +66,6 @@
import Data.Map (Map)
import qualified Data.Map as Map
import Data.Time (UTCTime, formatTime)
-import Data.Time.Compat (toUTCTime)
import Filesystem.Path.CurrentOS (commonPrefix, encodeString, decodeString, collapse, append)
import Happstack.Server.Monads (ServerMonad(askRq), FilterMonad, WebMonad)
import Happstack.Server.Response (ToMessage(toResponse), ifModifiedSince, forbidden, ok, seeOther)
@@ -80,6 +79,10 @@
import qualified Text.Blaze.Html5 as H
import qualified Text.Blaze.Html5.Attributes as A
+-- Fedora change to avoid packaging time-compat:
+--import Data.Time.Compat (toUTCTime)
+toUTCTime = id
+
-- * Mime-Type / Content-Type
-- |a 'Map' from file extensions to content-types