From b05a51cc71c95f9633b73d2d7c74308dcc4416d7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: May 02 2014 08:47:07 +0000 Subject: update to 4.5.1.0 move example dir to devel doc --- diff --git a/.gitignore b/.gitignore index 15d07e2..0018aa4 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /hakyll-4.3.0.0.tar.gz /hakyll-4.3.1.0.tar.gz /hakyll-4.4.3.1.tar.gz +/hakyll-4.5.1.0.tar.gz diff --git a/ghc-hakyll.spec b/ghc-hakyll.spec index 953e869..04d3050 100644 --- a/ghc-hakyll.spec +++ b/ghc-hakyll.spec @@ -3,13 +3,13 @@ %global pkg_name hakyll Name: ghc-%{pkg_name} -Version: 4.4.3.1 +Version: 4.5.1.0 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 +Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz Patch0: hakyll-4.4.3.1-citeproc-hs-only.patch BuildRequires: ghc-Cabal-devel @@ -79,6 +79,9 @@ cabal-tweak-flag watchServer False %install %ghc_lib_install +# put in devel doc +rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}/example + %post devel %ghc_pkg_recache @@ -94,10 +97,15 @@ cabal-tweak-flag watchServer False %files devel -f %{name}-devel.files +%doc data/example %{_bindir}/hakyll-init %changelog +* Fri May 02 2014 Jens Petersen - 4.5.1.0-1 +- update to 4.5.1.0 +- move example dir to devel doc + * Wed Jan 22 2014 Jens Petersen - 4.4.3.1-1 - update to 4.4.3.1 - disable watchServer (needs fsnotify) diff --git a/hakyll-4.4.3.1-citeproc-hs-only.patch b/hakyll-4.4.3.1-citeproc-hs-only.patch index 09923c3..7d1f425 100644 --- a/hakyll-4.4.3.1-citeproc-hs-only.patch +++ b/hakyll-4.4.3.1-citeproc-hs-only.patch @@ -1,11 +1,10 @@ -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 +--- hakyll-4.5.1.0/hakyll.cabal~ 2014-01-22 17:37:20.846682374 +0900 ++++ hakyll-4.5.1.0/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, +- pandoc-citeproc >= 0.1 && < 0.4, + citeproc-hs, parsec >= 3.0 && < 3.2, process >= 1.0 && < 1.3, @@ -14,7 +13,7 @@ diff -up hakyll-4.4.3.1/hakyll.cabal~ hakyll-4.4.3.1/hakyll.cabal old-locale >= 1.0 && < 1.1, old-time >= 1.0 && < 1.2, pandoc >= 1.12 && < 1.13, -- pandoc-citeproc >= 0.1 && < 0.3, +- pandoc-citeproc >= 0.1 && < 0.4, + citeproc-hs, parsec >= 3.0 && < 3.2, process >= 1.0 && < 1.3, diff --git a/sources b/sources index 1196591..c16ce56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06f92ca169022aa6d1c4a768f8c695bc hakyll-4.4.3.1.tar.gz +df1d0d92f2da9958e2b1b69a81cfcdc1 hakyll-4.5.1.0.tar.gz