diff --git a/.gitignore b/.gitignore index 12b588d..a3de726 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ /happstack-server-7.1.7.1.tar.gz /happstack-server-7.3.8.tar.gz /happstack-server-7.3.9.tar.gz -/happstack-server-7.4.4.tar.gz diff --git a/ghc-happstack-server.spec b/ghc-happstack-server.spec index 91d1e5b..cdab2ed 100644 --- a/ghc-happstack-server.spec +++ b/ghc-happstack-server.spec @@ -5,8 +5,8 @@ %bcond_without tests Name: ghc-%{pkg_name} -Version: 7.4.4 -Release: 2%{?dist} +Version: 7.3.9 +Release: 3%{?dist} Summary: Happstack web server License: BSD @@ -22,7 +22,6 @@ BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel -BuildRequires: ghc-exceptions-devel BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-hslogger-devel @@ -30,7 +29,6 @@ BuildRequires: ghc-html-devel BuildRequires: ghc-monad-control-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel -BuildRequires: ghc-network-uri-devel BuildRequires: ghc-old-locale-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-process-devel @@ -42,7 +40,6 @@ BuildRequires: ghc-text-devel BuildRequires: ghc-threads-devel BuildRequires: ghc-time-devel BuildRequires: ghc-transformers-base-devel -BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-unix-devel BuildRequires: ghc-utf8-string-devel @@ -86,8 +83,6 @@ files. %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/COPYING - %check %if %{with tests} @@ -104,19 +99,16 @@ rm %{buildroot}%{ghc_pkgdocdir}/COPYING %files -f %{name}.files -%license COPYING +%doc COPYING %files devel -f %{name}-devel.files %changelog -* Wed Feb 03 2016 Fedora Release Engineering - 7.4.4-2 +* Wed Feb 03 2016 Fedora Release Engineering - 7.3.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -* Tue Sep 29 2015 Jens Petersen - 7.4.4-1 -- update to 7.4.4 - * Wed Jun 17 2015 Fedora Release Engineering - 7.3.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/happstack-server-time-compat.patch b/happstack-server-time-compat.patch index b5ead9b..382a4c5 100644 --- a/happstack-server-time-compat.patch +++ b/happstack-server-time-compat.patch @@ -1,26 +1,24 @@ -diff -up happstack-server-7.4.4/happstack-server.cabal~ happstack-server-7.4.4/happstack-server.cabal ---- happstack-server-7.4.4/happstack-server.cabal~ 2015-05-15 10:22:24.000000000 +0900 -+++ happstack-server-7.4.4/happstack-server.cabal 2015-09-29 14:33:12.521350229 +0900 -@@ -93,7 +93,6 @@ Library +--- happstack-server-7.3.9/happstack-server.cabal.orig 2015-03-04 00:22:58.607285588 +0900 ++++ happstack-server-7.3.9/happstack-server.cabal 2015-03-04 00:23:29.666225638 +0900 +@@ -93,7 +93,6 @@ syb, - text >= 0.10 && < 1.3, + text >= 0.10 && < 1.3, time, - time-compat, - threads >= 0.5, - transformers >= 0.1.3 && < 0.5, - transformers-base >= 0.4 && < 0.5, -diff -up happstack-server-7.4.4/src/Happstack/Server/FileServe/BuildingBlocks.hs~ happstack-server-7.4.4/src/Happstack/Server/FileServe/BuildingBlocks.hs ---- happstack-server-7.4.4/src/Happstack/Server/FileServe/BuildingBlocks.hs~ 2015-05-15 10:22:24.000000000 +0900 -+++ happstack-server-7.4.4/src/Happstack/Server/FileServe/BuildingBlocks.hs 2015-09-29 14:34:35.210452384 +0900 -@@ -65,7 +65,6 @@ import Data.List (sor - import Data.Maybe (fromMaybe) + threads >= 0.5, + transformers >= 0.1.3 && < 0.5, + 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) -@@ -78,6 +77,10 @@ import Text.Blaze.Html +@@ -80,6 +79,10 @@ import qualified Text.Blaze.Html5 as H import qualified Text.Blaze.Html5.Attributes as A @@ -28,6 +26,6 @@ diff -up happstack-server-7.4.4/src/Happstack/Server/FileServe/BuildingBlocks.hs +--import Data.Time.Compat (toUTCTime) +toUTCTime = id + - #if MIN_VERSION_time(1,5,0) - import Data.Time (UTCTime, formatTime, defaultTimeLocale) - #else + -- * Mime-Type / Content-Type + + -- |a 'Map' from file extensions to content-types diff --git a/sources b/sources index 7257c47..f18642c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8cac1bbbc2841104827943b5e4f6e3fe happstack-server-7.4.4.tar.gz +ef72846dd1601dde4f6281ae3ffc750c happstack-server-7.3.9.tar.gz