From cbc82b2f43bd2bbe20a5ba42a228f5b517843802 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mar 10 2013 12:40:39 +0000 Subject: update to 4.2.1.2 - no longer depends on hamlet - update deps - disable checkExternal since it requires http-conduit --- diff --git a/.gitignore b/.gitignore index 97a0f76..e187916 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /hakyll-3.2.6.2.tar.gz /hakyll-3.2.7.2.tar.gz /hakyll-3.4.0.0.tar.gz +/hakyll-4.2.1.2.tar.gz diff --git a/ghc-hakyll.spec b/ghc-hakyll.spec index 4750e8b..5ec2db6 100644 --- a/ghc-hakyll.spec +++ b/ghc-hakyll.spec @@ -10,14 +10,13 @@ It provides you with the tools to create a simple or advanced static website\ using a Haskell DSL and formats such as markdown or RST. Name: ghc-%{pkg_name} -Version: 3.4.0.0 -Release: 3%{?dist} +Version: 4.2.1.2 +Release: 1%{?dist} Summary: %{common_summary} 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: hakyll-no-previewServer.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -27,26 +26,26 @@ BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-citeproc-hs-devel +BuildRequires: ghc-cmdargs-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-cryptohash-devel +BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel -BuildRequires: ghc-hamlet-devel +BuildRequires: ghc-lrucache-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-old-locale-devel BuildRequires: ghc-old-time-devel BuildRequires: ghc-pandoc-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-process-devel +BuildRequires: ghc-random-devel BuildRequires: ghc-regex-base-devel BuildRequires: ghc-regex-tdfa-devel BuildRequires: ghc-tagsoup-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel -BuildRequires: ghc-unix-devel # End cabal-rpm deps -# hamlet uses template-haskell -ExclusiveArch: %{ghc_arches_with_ghci} %description %{common_description} @@ -54,9 +53,9 @@ ExclusiveArch: %{ghc_arches_with_ghci} %prep %setup -q -n %{pkg_name}-%{version} -%patch1 -p1 -b .orig -cabal-tweak-dep-ver hamlet "< 1.1" "< 1.2" +cabal-tweak-flag checkExternal False +cabal-tweak-flag previewServer False %build @@ -80,6 +79,11 @@ cabal-tweak-dep-ver hamlet "< 1.1" "< 1.2" %changelog +* Sun Mar 10 2013 Jens Petersen - 4.2.1.2-1 +- update to 4.2.1.2 +- no longer depends on hamlet +- disable checkExternal since it requires http-conduit + * Wed Feb 13 2013 Fedora Release Engineering - 3.4.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/hakyll-no-previewServer.patch b/hakyll-no-previewServer.patch deleted file mode 100644 index d5e654e..0000000 --- a/hakyll-no-previewServer.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u hakyll-3.4.0.0/hakyll.cabal\~ hakyll-3.4.0.0/hakyll.cabal ---- hakyll-3.4.0.0/hakyll.cabal~ 2012-07-13 19:10:55.000000000 +0900 -+++ hakyll-3.4.0.0/hakyll.cabal 2012-10-29 17:39:22.239893063 +0900 -@@ -52,7 +52,7 @@ - - Flag previewServer - Description: Include the preview server -- Default: True -+ Default: False - - Flag unixFilter - Description: Include the UnixFilter module diff --git a/sources b/sources index 614137b..b8c617c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dd4ae787ac0cce1a79aa65a1d9bf3d45 hakyll-3.4.0.0.tar.gz +8cd3399ee260c25de7ecae391e199fdb hakyll-4.2.1.2.tar.gz