[ghc-hakyll] update to 4.4.3.1
Jens Petersen
petersen at fedoraproject.org
Wed Jan 22 10:03:20 UTC 2014
commit b6b74adaa48a3774de9544e7a9e9d467bf110d89
Author: Jens Petersen <petersen at redhat.com>
Date: Wed Jan 22 18:32:04 2014 +0900
update to 4.4.3.1
- disable watchServer (needs fsnotify)
- patch to use citeproc-hs until pandoc-citeproc packaged
(this may cause biblio regressions)
.gitignore | 1 +
ghc-hakyll.spec | 16 +++++-
hakyll-4.4.3.1-citeproc-hs-only.patch | 82 +++++++++++++++++++++++++++++++++
sources | 2 +-
4 files changed, 97 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cb2891e..15d07e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/hakyll-4.2.2.0.tar.gz
/hakyll-4.3.0.0.tar.gz
/hakyll-4.3.1.0.tar.gz
+/hakyll-4.4.3.1.tar.gz
diff --git a/ghc-hakyll.spec b/ghc-hakyll.spec
index 903f2c9..234f7d4 100644
--- a/ghc-hakyll.spec
+++ b/ghc-hakyll.spec
@@ -3,13 +3,14 @@
%global pkg_name hakyll
Name: ghc-%{pkg_name}
-Version: 4.3.1.0
-Release: 4%{?dist}
+Version: 4.4.3.1
+Release: 1%{?dist}
Summary: Static website compiler library
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
+Patch0: hakyll-4.4.3.1-citeproc-hs-only.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@@ -51,10 +52,11 @@ using a Haskell DSL and formats such as markdown or RST.
%package devel
Summary: Haskell %{pkg_name} library development files
+Provides: %{name}-static = %{version}-%{release}
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.
@@ -62,9 +64,11 @@ This package provides the Haskell %{pkg_name} library development files.
%prep
%setup -q -n %{pkg_name}-%{version}
+%patch0 -p1 -b .citeproc~
cabal-tweak-flag checkExternal False
cabal-tweak-flag previewServer False
+cabal-tweak-flag watchServer False
%build
@@ -93,6 +97,12 @@ cabal-tweak-flag previewServer False
%changelog
+* Wed Jan 22 2014 Jens Petersen <petersen at redhat.com> - 4.4.3.1-1
+- update to 4.4.3.1
+- disable watchServer (needs fsnotify)
+- patch to use citeproc-hs until pandoc-citeproc packaged:
+ this may cause biblio regressions
+
* Wed Aug 28 2013 Jens Petersen <petersen at redhat.com> - 4.3.1.0-4
- temporarily exclude armv7hl since pandoc not building there (#992364)
diff --git a/hakyll-4.4.3.1-citeproc-hs-only.patch b/hakyll-4.4.3.1-citeproc-hs-only.patch
new file mode 100644
index 0000000..09923c3
--- /dev/null
+++ b/hakyll-4.4.3.1-citeproc-hs-only.patch
@@ -0,0 +1,82 @@
+diff -up hakyll-4.4.3.1/hakyll.cabal~ hakyll-4.4.3.1/hakyll.cabal
+--- hakyll-4.4.3.1/hakyll.cabal~ 2014-01-22 17:37:20.846682374 +0900
++++ hakyll-4.4.3.1/hakyll.cabal 2014-01-22 17:51:58.195773794 +0900
+@@ -159,7 +159,7 @@ Library
+ old-locale >= 1.0 && < 1.1,
+ old-time >= 1.0 && < 1.2,
+ pandoc >= 1.12 && < 1.13,
+- pandoc-citeproc >= 0.1 && < 0.3,
++ citeproc-hs,
+ parsec >= 3.0 && < 3.2,
+ process >= 1.0 && < 1.3,
+ random >= 1.0 && < 1.1,
+@@ -245,7 +245,7 @@ Test-suite hakyll-tests
+ old-locale >= 1.0 && < 1.1,
+ old-time >= 1.0 && < 1.2,
+ pandoc >= 1.12 && < 1.13,
+- pandoc-citeproc >= 0.1 && < 0.3,
++ citeproc-hs,
+ parsec >= 3.0 && < 3.2,
+ process >= 1.0 && < 1.3,
+ random >= 1.0 && < 1.1,
+diff -up hakyll-4.4.3.1/src/Hakyll/Web/Pandoc/Biblio.hs~ hakyll-4.4.3.1/src/Hakyll/Web/Pandoc/Biblio.hs
+--- hakyll-4.4.3.1/src/Hakyll/Web/Pandoc/Biblio.hs~ 2014-01-19 21:34:39.000000000 +0900
++++ hakyll-4.4.3.1/src/Hakyll/Web/Pandoc/Biblio.hs 2014-01-22 18:03:17.780618491 +0900
+@@ -15,7 +15,7 @@ module Hakyll.Web.Pandoc.Biblio
+ , cslCompiler
+ , Biblio (..)
+ , biblioCompiler
+- , readPandocBiblio
++-- , readPandocBiblio
+ ) where
+
+
+@@ -24,7 +24,7 @@ import Control.Applicative
+ import Data.Binary (Binary (..))
+ import Data.Typeable (Typeable)
+ import qualified Text.CSL as CSL
+-import Text.CSL.Pandoc (processCites)
++-- import Text.CSL.Pandoc (processCites)
+ import Text.Pandoc (Pandoc, ReaderOptions (..))
+
+ --------------------------------------------------------------------------------
+@@ -82,22 +82,22 @@ biblioCompiler = do
+ makeItem =<< unsafeCompiler (Biblio <$> CSL.readBiblioFile filePath)
+
+
+---------------------------------------------------------------------------------
+-readPandocBiblio :: ReaderOptions
+- -> Item CSL
+- -> Item Biblio
+- -> (Item String)
+- -> Compiler (Item Pandoc)
+-readPandocBiblio ropt csl biblio item = do
+- -- Parse CSL file, if given
+- style <- unsafeCompiler $ CSL.readCSLFile . toFilePath . itemIdentifier $ csl
+-
+- -- We need to know the citation keys, add then *before* actually parsing the
+- -- actual page. If we don't do this, pandoc won't even consider them
+- -- citations!
+- let Biblio refs = itemBody biblio
+- pandoc = itemBody $ readPandocWith ropt item
+- pandoc' = processCites style refs pandoc
++-- --------------------------------------------------------------------------------
++-- readPandocBiblio :: ReaderOptions
++-- -> Item CSL
++-- -> Item Biblio
++-- -> (Item String)
++-- -> Compiler (Item Pandoc)
++-- readPandocBiblio ropt csl biblio item = do
++-- -- Parse CSL file, if given
++-- style <- unsafeCompiler $ CSL.readCSLFile . toFilePath . itemIdentifier $ csl
++
++-- -- We need to know the citation keys, add then *before* actually parsing the
++-- -- actual page. If we don't do this, pandoc won't even consider them
++-- -- citations!
++-- let Biblio refs = itemBody biblio
++-- pandoc = itemBody $ readPandocWith ropt item
++-- pandoc' = processCites style refs pandoc
+
+- return $ fmap (const pandoc') item
++-- return $ fmap (const pandoc') item
+
diff --git a/sources b/sources
index a60f8be..1196591 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c781eaaae8e26a128ab7ab90d1888972 hakyll-4.3.1.0.tar.gz
+06f92ca169022aa6d1c4a768f8c695bc hakyll-4.4.3.1.tar.gz
More information about the scm-commits
mailing list