[ghc-Agda] allow building with haskell-src-exts-1.13
Jens Petersen
petersen at fedoraproject.org
Fri Jun 22 01:44:49 UTC 2012
commit 93e3504c13fe36727847a593076483a2b7f98cba
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Jun 22 10:44:44 2012 +0900
allow building with haskell-src-exts-1.13
Agda-2.3.0.1-haskell-src-exts.patch | 12 ++++++++++++
ghc-Agda.spec | 6 ++++--
2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/Agda-2.3.0.1-haskell-src-exts.patch b/Agda-2.3.0.1-haskell-src-exts.patch
new file mode 100644
index 0000000..151bb81
--- /dev/null
+++ b/Agda-2.3.0.1-haskell-src-exts.patch
@@ -0,0 +1,12 @@
+diff -u Agda-2.3.0.1/Agda.cabal\~ Agda-2.3.0.1/Agda.cabal
+--- Agda-2.3.0.1/Agda.cabal~ 2012-06-11 12:13:01.174134489 +0900
++++ Agda-2.3.0.1/Agda.cabal 2012-06-22 09:52:32.132828546 +0900
+@@ -77,7 +77,7 @@
+ build-depends: epic >= 0.1.13 && < 0.10
+ build-depends: mtl >= 2.0,
+ QuickCheck >= 2.3 && < 2.5,
+- haskell-src-exts >= 1.9.6 && < 1.12,
++ haskell-src-exts >= 1.9.6 && < 2,
+ containers >= 0.1 && < 0.5,
+ pretty >= 1.0 && < 1.2,
+ directory >= 1.0 && < 1.2,
diff --git a/ghc-Agda.spec b/ghc-Agda.spec
index 3cd72eb..f3702d7 100644
--- a/ghc-Agda.spec
+++ b/ghc-Agda.spec
@@ -50,6 +50,7 @@ BuildRequires: ghc-zlib-prof
BuildRequires: happy, alex
BuildRequires: emacs-haskell-mode
Patch1: Agda-2.3.0.1-mtl-2.1.patch
+Patch2: Agda-2.3.0.1-haskell-src-exts.patch
%description
%{common_description}
@@ -87,7 +88,8 @@ This provides the Emacs Lisp source files for the Agda interactive mode.
%prep
%setup -q -n %{pkg_name}-%{version}
-%patch1 -p1 -b .orig
+%patch1 -p1 -b .1.orig~
+%patch2 -p1 -b .2~
%build
@@ -148,7 +150,7 @@ echo %{_datadir}/%{pkg_name}-%{version}/Agda.css >> ghc-%{pkg_name}.files
%changelog
* Thu Jun 21 2012 Jens Petersen <petersen at redhat.com> - 2.3.0.1-4
-- rebuild
+- allow building with haskell-src-exts-1.13
* Mon Jun 11 2012 Jens Petersen <petersen at redhat.com> - 2.3.0.1-3
- allow building with mtl-2.1
More information about the scm-commits
mailing list