[ghc-hakyll/f18] revert back to 3.2.7.2
Jens Petersen
petersen at fedoraproject.org
Mon Dec 3 07:17:47 UTC 2012
commit 7fc6675e9d2496e85f56ccec51f4a4e62fdbf8e5
Author: Jens Petersen <petersen at redhat.com>
Date: Mon Dec 3 16:17:35 2012 +0900
revert back to 3.2.7.2
.gitignore | 1 -
ghc-hakyll.spec | 19 ++++++++-----------
hakyll-no-previewServer.patch | 13 ++++++-------
sources | 2 +-
4 files changed, 15 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 97a0f76..5429adf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@
/hakyll-3.2.6.1.tar.gz
/hakyll-3.2.6.2.tar.gz
/hakyll-3.2.7.2.tar.gz
-/hakyll-3.4.0.0.tar.gz
diff --git a/ghc-hakyll.spec b/ghc-hakyll.spec
index fac3f5c..0b775fa 100644
--- a/ghc-hakyll.spec
+++ b/ghc-hakyll.spec
@@ -10,20 +10,20 @@ 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: 1%{?dist}
+Version: 3.2.7.2
+Release: 7%{?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
# Begin cabal-rpm deps:
BuildRequires: ghc-binary-devel
BuildRequires: ghc-blaze-html-devel
-BuildRequires: ghc-blaze-markup-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-citeproc-hs-devel
BuildRequires: ghc-containers-devel
@@ -40,11 +40,11 @@ BuildRequires: ghc-process-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
-Patch1: hakyll-no-previewServer.patch
+# hamlet uses template-haskell
+ExclusiveArch: %{ghc_arches_with_ghci}
%description
%{common_description}
@@ -54,8 +54,6 @@ Patch1: hakyll-no-previewServer.patch
%setup -q -n %{pkg_name}-%{version}
%patch1 -p1 -b .orig
-cabal-tweak-dep-ver hamlet "< 1.1" "< 1.2"
-
%build
%ghc_lib_build
@@ -78,10 +76,9 @@ cabal-tweak-dep-ver hamlet "< 1.1" "< 1.2"
%changelog
-* Mon Oct 29 2012 Jens Petersen <petersen at redhat.com> - 3.4.0.0-1
-- update to 3.4.0.0 with cabal-rpm
-- disable previewServer until snap-server packaged
-- allow hamlet-1.1
+* Mon Dec 3 2012 Jens Petersen <petersen at redhat.com> - 3.2.7.2-7
+- update to cabal-rpm
+- disable previewServer explicitly until snap-server packaged
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.7.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/hakyll-no-previewServer.patch b/hakyll-no-previewServer.patch
index d5e654e..dc8e3e7 100644
--- a/hakyll-no-previewServer.patch
+++ b/hakyll-no-previewServer.patch
@@ -1,12 +1,11 @@
-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
+--- hakyll-3.2.7.2/hakyll.cabal~ 2012-04-16 02:48:06.000000000 +0900
++++ hakyll-3.2.7.2/hakyll.cabal 2012-12-03 13:04:18.347570221 +0900
@@ -52,7 +52,7 @@
Flag previewServer
Description: Include the preview server
-- Default: True
-+ Default: False
+- default: True
++ default: False
- Flag unixFilter
- Description: Include the UnixFilter module
+ Library
+ Ghc-Options: -Wall
diff --git a/sources b/sources
index 614137b..39a9bee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd4ae787ac0cce1a79aa65a1d9bf3d45 hakyll-3.4.0.0.tar.gz
+dd4d262bbc82474bcf1630f72ba6999c hakyll-3.2.7.2.tar.gz
More information about the scm-commits
mailing list