[ghc-happstack-server] update to 7.1.0

Jens Petersen petersen at fedoraproject.org
Wed Sep 4 08:02:57 UTC 2013


commit 453595b78340cf6e405dca323f0b631ee693b97e
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Sep 4 16:44:52 2013 +0900

    update to 7.1.0

 .gitignore                              |    1 +
 ghc-happstack-server.spec               |   29 +++----
 happstack-server-7.0-ghc76-time.patch   |  159 -------------------------------
 happstack-server-7.0.0-blaze-html.patch |   24 -----
 happstack-server-default-to-base4.patch |   11 --
 sources                                 |    2 +-
 6 files changed, 14 insertions(+), 212 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 13e6932..f7134e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /happstack-server-7.0.0.tar.gz
+/happstack-server-7.1.0.tar.gz
diff --git a/ghc-happstack-server.spec b/ghc-happstack-server.spec
index 5d3585d..de4a2da 100644
--- a/ghc-happstack-server.spec
+++ b/ghc-happstack-server.spec
@@ -3,23 +3,19 @@
 %global pkg_name happstack-server
 
 Name:           ghc-%{pkg_name}
-Version:        7.0.0
-Release:        10%{?dist}
+Version:        7.1.0
+Release:        1%{?dist}
 Summary:        Happstack web server
 
 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-blaze-html.patch
-Patch3:         happstack-server-7.0-ghc76-time.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-base64-bytestring-devel
 BuildRequires:  ghc-blaze-html-devel
-BuildRequires:  ghc-blaze-markup-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-directory-devel
@@ -31,16 +27,17 @@ 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-system-filepath-devel
 BuildRequires:  ghc-template-haskell-devel
 BuildRequires:  ghc-text-devel
+BuildRequires:  ghc-threads-devel
 BuildRequires:  ghc-time-devel
-BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-transformers-base-devel
+BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-unix-devel
 BuildRequires:  ghc-utf8-string-devel
 BuildRequires:  ghc-xhtml-devel
@@ -61,22 +58,17 @@ Summary:        Haskell %{pkg_name} library development files
 Requires:       ghc-compiler = %{ghc_version}
 Requires(post): ghc-compiler = %{ghc_version}
 Requires(postun): ghc-compiler = %{ghc_version}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
-This package provides the Haskell %{pkg_name} library development files.
+This package provides the Haskell %{pkg_name} library development
+files.
 
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
-%patch1 -p1 -b .1-orig~
-%patch2 -p1 -b .2-blaze~
-%patch3 -p1 -b .3-time~
 
-cabal-tweak-dep-ver base64-bytestring "== 0.1.*" "== 1.*"
-cabal-tweak-dep-ver blaze-html "< 0.6" "< 0.7"
-cabal-tweak-dep-ver mtl "< 2.1" "< 2.2"
-cabal-tweak-dep-ver transformers "< 0.3" "< 0.4"
+cabal-tweak-dep-ver blaze-html "== 0.5.*" ">= 0.5"
 
 
 %build
@@ -103,6 +95,9 @@ cabal-tweak-dep-ver transformers "< 0.3" "< 0.4"
 
 
 %changelog
+* Wed Sep 04 2013 Jens Petersen <petersen at redhat.com> - 7.1.0-1
+- update to 7.1.0
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.0.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 3c47c45..66170f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ade8cc2a071293515a1d2c85e63f71ad  happstack-server-7.0.0.tar.gz
+0ff6b660ad1832c23f40e5e0d0e74b4a  happstack-server-7.1.0.tar.gz


More information about the scm-commits mailing list