commit 0dc958cbeaaa64077d79a7446ec8c4db34dded88
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Sep 1 16:06:51 2014 +0900
update to 7.3.8
.gitignore | 1 +
ghc-happstack-server.spec | 24 +++++++++++++++++++++---
happstack-server-time-compat.patch | 10 +++++-----
sources | 2 +-
4 files changed, 28 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32a92ab..a127c14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/happstack-server-7.0.0.tar.gz
/happstack-server-7.1.0.tar.gz
/happstack-server-7.1.7.1.tar.gz
+/happstack-server-7.3.8.tar.gz
diff --git a/ghc-happstack-server.spec b/ghc-happstack-server.spec
index 6783f59..9d59912 100644
--- a/ghc-happstack-server.spec
+++ b/ghc-happstack-server.spec
@@ -2,15 +2,20 @@
%global pkg_name happstack-server
+%bcond_without tests
+
+# no useful debuginfo for Haskell packages without C sources
+%global debug_package %{nil}
+
Name: ghc-%{pkg_name}
-Version: 7.1.7.1
-Release: 3%{?dist}
+Version: 7.3.8
+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/package/%{pkg_name}-%{version}/%{pkg_name}-%{v...
+Patch1: happstack-server-time-compat.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@@ -44,6 +49,9 @@ BuildRequires: ghc-utf8-string-devel
BuildRequires: ghc-xhtml-devel
BuildRequires: ghc-zlib-devel
ExclusiveArch: %{ghc_arches_with_ghci}
+%if %{with tests}
+BuildRequires: ghc-HUnit-devel
+%endif
# End cabal-rpm deps
%description
@@ -80,6 +88,12 @@ files.
%ghc_lib_install
+%check
+%if %{with tests}
+%cabal test
+%endif
+
+
%post devel
%ghc_pkg_recache
@@ -96,6 +110,10 @@ files.
%changelog
+* Mon Sep 01 2014 Jens Petersen <petersen(a)redhat.com> - 7.3.8-1
+- update to 7.3.8
+- refresh to cblrpm-0.8.11
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
7.1.7.1-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/happstack-server-time-compat.patch b/happstack-server-time-compat.patch
index 9bfdf31..1c3a1d1 100644
--- a/happstack-server-time-compat.patch
+++ b/happstack-server-time-compat.patch
@@ -1,12 +1,12 @@
---- 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 @@
+--- happstack-server-7.3.8/happstack-server.cabal~ 2014-08-20 07:33:35.000000000 +0900
++++ happstack-server-7.3.8/happstack-server.cabal 2014-09-01 16:01:47.606488979 +0900
+@@ -93,7 +93,6 @@
syb,
- text >= 0.10 && < 0.12,
+ text >= 0.10 && < 1.2,
time,
- time-compat,
threads >= 0.5,
- transformers >= 0.1.3 && < 0.4,
+ 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
diff --git a/sources b/sources
index e95c16d..482f3f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7b6ec61441321cb79a47459c87074cd happstack-server-7.1.7.1.tar.gz
+d3b2ad286265dcfd5409ec470731e41e happstack-server-7.3.8.tar.gz