[ghc-hakyll] update to 4.5.2.0 and build with new pandoc-citeproc package

[Jens Petersen]

commit 659d76e7690b0d35ec45ce60d46453775db7262f
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jul 16 17:29:44 2014 +0900

    update to 4.5.2.0 and build with new pandoc-citeproc package

 .gitignore                            |    1 +
 ghc-hakyll.spec                       |   30 ++++++++++--
 hakyll-4.4.3.1-citeproc-hs-only.patch |   81 ---------------------------------
 sources                               |    2 +-
 4 files changed, 27 insertions(+), 87 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0018aa4..2aea8c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /hakyll-4.3.1.0.tar.gz
 /hakyll-4.4.3.1.tar.gz
 /hakyll-4.5.1.0.tar.gz
+/hakyll-4.5.2.0.tar.gz
diff --git a/ghc-hakyll.spec b/ghc-hakyll.spec
index 2176356..15081de 100644
--- a/ghc-hakyll.spec
+++ b/ghc-hakyll.spec
@@ -2,15 +2,19 @@
 
 %global pkg_name hakyll
 
+%bcond_with tests
+
+# no useful debuginfo for Haskell packages without C sources
+%global debug_package %{nil}
+
 Name:           ghc-%{pkg_name}
-Version:        4.5.1.0
-Release:        4%{?dist}
+Version:        4.5.2.0
+Release:        1%{?dist}
 Summary:        Static website compiler library
 
 License:        BSD
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 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
 BuildRequires:  ghc-rpm-macros
@@ -19,7 +23,6 @@ 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-cmdargs-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-cryptohash-devel
@@ -33,6 +36,7 @@ BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-network-devel
 BuildRequires:  ghc-old-locale-devel
 BuildRequires:  ghc-old-time-devel
+BuildRequires:  ghc-pandoc-citeproc-devel
 BuildRequires:  ghc-pandoc-devel
 BuildRequires:  ghc-parsec-devel
 BuildRequires:  ghc-process-devel
@@ -45,6 +49,13 @@ BuildRequires:  ghc-system-filepath-devel
 BuildRequires:  ghc-tagsoup-devel
 BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-time-devel
+%if %{with tests}
+BuildRequires:  ghc-HUnit-devel
+BuildRequires:  ghc-QuickCheck-devel
+BuildRequires:  ghc-test-framework-devel
+BuildRequires:  ghc-test-framework-hunit-devel
+BuildRequires:  ghc-test-framework-quickcheck2-devel
+%endif
 # End cabal-rpm deps
 
 %description
@@ -67,7 +78,6 @@ 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
 
@@ -83,6 +93,12 @@ cabal-tweak-flag checkExternal False
 rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}/example
 
 
+%check
+%if %{with tests}
+%cabal test
+%endif
+
+
 %post devel
 %ghc_pkg_recache
 
@@ -102,6 +118,10 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}/example
 
 
 %changelog
+* Wed Jul 16 2014 Jens Petersen <petersen at redhat.com> - 4.5.2.0-1
+- update to 4.5.2.0 and cblrpm-0.8.11
+- build with pandoc-citeproc instead of citeproc-hs hack
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index c16ce56..8484862 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df1d0d92f2da9958e2b1b69a81cfcdc1  hakyll-4.5.1.0.tar.gz
+ec1cdcd04faf8d6c2f2d792f1c00208c  hakyll-4.5.2.0.tar.gz