diff --git a/.gitignore b/.gitignore index 26e1396..709d787 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /wai-extra-0.4.3.tar.gz /wai-extra-0.4.5.2.tar.gz /wai-extra-0.4.6.tar.gz +/wai-extra-1.2.0.4.tar.gz diff --git a/ghc-wai-extra.spec b/ghc-wai-extra.spec index 1c9db5f..c409fb0 100644 --- a/ghc-wai-extra.spec +++ b/ghc-wai-extra.spec @@ -9,12 +9,12 @@ %global common_description This library provides common Web Application Interface features. Name: ghc-%{pkg_name} -Version: 0.4.6 -Release: 4%{?dist} +Version: 1.2.0.4 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries -License: BSD +License: MIT # 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 @@ -22,15 +22,15 @@ ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec -BuildRequires: ghc-blaze-builder-enumerator-prof -BuildRequires: ghc-case-insensitive-prof -BuildRequires: ghc-data-default-prof -BuildRequires: ghc-directory-prof -BuildRequires: ghc-fast-logger-prof -BuildRequires: ghc-time-prof -BuildRequires: ghc-wai-prof -BuildRequires: ghc-zlib-enum-prof -Patch1: wai-extra-0.4.6-default-data-0.4.patch +BuildRequires: ghc-ansi-terminal-devel +BuildRequires: ghc-blaze-builder-conduit-devel +BuildRequires: ghc-case-insensitive-devel +BuildRequires: ghc-data-default-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-fast-logger-devel +BuildRequires: ghc-time-devel +BuildRequires: ghc-wai-devel +BuildRequires: ghc-zlib-conduit-devel %description %{common_description} @@ -38,7 +38,6 @@ Patch1: wai-extra-0.4.6-default-data-0.4.patch %prep %setup -q -n %{pkg_name}-%{version} -%patch1 -p1 -b .orig %build @@ -61,8 +60,12 @@ Patch1: wai-extra-0.4.6-default-data-0.4.patch %changelog +* Wed May 16 2012 Jens Petersen - 1.2.0.4-1 +- update to 1.2.0.4 +- license is now MIT + * Tue May 1 2012 Jens Petersen - 0.4.6-4 -- rebuild +- allows zlib-bindings 0.1 * Wed Apr 11 2012 Jens Petersen - 0.4.6-3 - allow data-default 0.4 diff --git a/sources b/sources index 4b158d3..e921f8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9fab19117ceca9f439ad14de81fa0ed0 wai-extra-0.4.6.tar.gz +ff5396e2df598460999bf9aa1fa6e532 wai-extra-1.2.0.4.tar.gz diff --git a/wai-extra-0.4.6-default-data-0.4.patch b/wai-extra-0.4.6-default-data-0.4.patch deleted file mode 100644 index 1877a2f..0000000 --- a/wai-extra-0.4.6-default-data-0.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u wai-extra-0.4.6/wai-extra.cabal\~ wai-extra-0.4.6/wai-extra.cabal ---- wai-extra-0.4.6/wai-extra.cabal~ 2011-12-26 19:59:14.000000000 +0900 -+++ wai-extra-0.4.6/wai-extra.cabal 2012-04-11 11:24:09.240570078 +0900 -@@ -36,7 +36,7 @@ - , text >= 0.7 && < 0.12 - , case-insensitive >= 0.2 - , zlib-enum >= 0.2.1 && < 0.3 -- , data-default >= 0.3 && < 0.4 -+ , data-default >= 0.3 && < 0.5 - , fast-logger >= 0.0.1 - - Exposed-modules: Network.Wai.Handler.CGI