From d7e804762726e5a7f88c532ef458e87c69dd2336 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Jan 27 2018 18:53:11 +0000
Subject: add parser-combinators for megaparsec


---

diff --git a/.gitignore b/.gitignore
index cb8b1e6..b50c2fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /megaparsec-5.2.0.tar.gz
 /hledger-lib-1.4.tar.gz
 /megaparsec-6.3.0.tar.gz
+/parser-combinators-0.4.0.tar.gz
diff --git a/ghc-hledger-lib.spec b/ghc-hledger-lib.spec
index 7dd9f8a..66c9181 100644
--- a/ghc-hledger-lib.spec
+++ b/ghc-hledger-lib.spec
@@ -5,7 +5,8 @@
 %global pkgver %{pkg_name}-%{version}
 
 %global megaparsec megaparsec-6.3.0
-%global subpkgs %{megaparsec}
+%global parsercombinators parser-combinators-0.4.0
+%global subpkgs %{parsercombinators} %{megaparsec}
 
 %bcond_with tests
 
@@ -19,6 +20,7 @@ License:        GPLv3
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
 Source1:        https://hackage.haskell.org/package/%{megaparsec}/%{megaparsec}.tar.gz
+Source2:        https://hackage.haskell.org/package/%{parsercombinators}/%{parsercombinators}.tar.gz
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros-extra
@@ -61,6 +63,7 @@ BuildRequires:  ghc-test-framework-hunit-devel
 # End cabal-rpm deps
 # megaparsec deps
 BuildRequires:  ghc-QuickCheck-devel
+BuildRequires:  ghc-case-insensitive-devel
 BuildRequires:  ghc-exceptions-devel
 BuildRequires:  ghc-scientific-devel
 
@@ -93,15 +96,21 @@ This package provides the Haskell %{pkg_name} library development files.
 
 %if %{defined ghclibdir}
 %ghc_lib_subpackage %{megaparsec}
+%ghc_lib_subpackage %{parsercombinators}
 %endif
 
 %global version %{main_version}
 
 
 %prep
-%setup -q -n %{pkgver} -a1
+%setup -q -n %{pkgver} -a1 -a2
 cabal-tweak-drop-dep mtl-compat
 
+(
+cd %{megaparsec}
+cabal-tweak-dep-ver parser-combinators '< 0.3' '< 1.0'
+)
+
 
 %build
 %ghc_libs_build %{subpkgs}
@@ -143,7 +152,7 @@ cabal-tweak-drop-dep mtl-compat
 %changelog
 * Wed Jan 24 2018 Jens Petersen <petersen@redhat.com> - 1.4-4
 - update to 1.4
-- update megaparsec to 6.3.0
+- update megaparsec to 6.3.0, which needs parser-combinators
 
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/sources b/sources
index efa698a..e10cfd3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (hledger-lib-1.4.tar.gz) = 21882c36c8998cc8fb21a57f907d52fe193b9091a4cb44774cb98b3fce7f50a148abae7acaa6d0bfafffc96803a7ccc60c52dd92efd5256757da106f33bafc60
 SHA512 (megaparsec-6.3.0.tar.gz) = 15e534de81267f61fbebded236b42e25817de93e21714f78746c9a39ebb48445b4fa529f38d2f43511018c37a062db6c8d32d812fe64e12799b3e5def79b5d1e
+SHA512 (parser-combinators-0.4.0.tar.gz) = 9748a8a23bef1cb386970722e148a4cc4e36e8f4100ac34794e2a2223b4bfe0f1e6e0f58d82b500e535cc42a0066be0c5bb5676892e4b607d8d6eac4c4f93a28