[ghc-Agda] conditionalize QuickCheck-2.5 patch, redefine _emacs_bytecompile for epel6
Jens Petersen
petersen at fedoraproject.org
Thu Dec 13 03:24:32 UTC 2012
commit f90798103650873fb5ba2bb442c39befcc8c40b4
Author: Jens Petersen <petersen at redhat.com>
Date: Wed Dec 12 19:23:50 2012 +0900
conditionalize QuickCheck-2.5 patch, redefine _emacs_bytecompile for epel6
ghc-Agda.spec | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/ghc-Agda.spec b/ghc-Agda.spec
index abd7c30..cd05118 100644
--- a/ghc-Agda.spec
+++ b/ghc-Agda.spec
@@ -19,7 +19,7 @@ proof assistants based on dependent types, such as Coq, Epigram and NuPRL.
Name: ghc-%{pkg_name}
Version: 2.3.0.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: %{common_summary}
License: MIT and BSD
@@ -103,13 +103,21 @@ cabal-tweak-dep-ver mtl "== 2.0.*" ">= 2.0"
cabal-tweak-dep-ver haskell-src-exts "< 1.12" "< 1.14"
%patch1 -p1 -b .orig
+# check for QuickCheck-2.5
+%if %(ghc-pkg list --simple-output --global QuickCheck | sed -e "s/QuickCheck-\(.\).\(.\).*/\1/") >= 25
%patch2 -p1 -b .QC
+%endif
%build
%ghc_lib_build
-%global elisp_files eri.el agda-input.el annotation.el agda2-highlight.el agda2-abbrevs.el agda2-mode.el agda2.el
+%define elisp_files eri.el agda-input.el annotation.el agda2-highlight.el agda2-abbrevs.el agda2-mode.el agda2.el
+
+# el6 macro does not add "." to load-path
+%if %{defined el6}
+%define _emacs_bytecompile /usr/bin/emacs -batch --no-init-file --no-site-file --eval '(progn (setq load-path (cons "." load-path)))' -f batch-byte-compile
+%endif
cd src/data/emacs-mode
for i in %elisp_files; do
@@ -162,6 +170,10 @@ echo %{_datadir}/%{pkg_name}-%{version}/Agda.css >> ghc-%{pkg_name}.files
%changelog
+* Wed Dec 12 2012 Jens Petersen <petersen at redhat.com> - 2.3.0.1-9
+- conditionalize QuickCheck-2.5 patch
+- for epel6 redefine newer _emacs_bytecompile
+
* Fri Nov 9 2012 Jens Petersen <petersen at redhat.com> - 2.3.0.1-8
- build with QuickCheck 2.5
More information about the scm-commits
mailing list