diff --git a/.gitignore b/.gitignore index 1d6f6e8..6efbfc8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /gappalib-coq-1.2.0.tar.gz /gappalib-coq-1.2.1.tar.gz /gappalib-coq-1.3.0.tar.gz +/gappalib-coq-1.3.1.tar.gz diff --git a/gappalib-coq-camlp4.patch b/gappalib-coq-camlp4.patch new file mode 100644 index 0000000..d93d709 --- /dev/null +++ b/gappalib-coq-camlp4.patch @@ -0,0 +1,13 @@ +--- src/gappatac.ml.orig 2016-09-27 13:08:26.000000000 -0600 ++++ src/gappatac.ml 2016-09-28 20:25:44.613882268 -0600 +@@ -819,9 +819,7 @@ let gappa_internal gl = + errorlabstrm "gappa_internal" + (Pp.str "execution of Gappa failed:" ++ Pp.fnl () ++ Pp.str s) + +-IFDEF COQ84 THEN +- +-ELSE ++IFNDEF COQ84 THEN + + let gappa_quote = Proofview.V82.tactic gappa_quote + let gappa_internal = Proofview.V82.tactic gappa_internal diff --git a/gappalib-coq.spec b/gappalib-coq.spec index b048095..bdd1832 100644 --- a/gappalib-coq.spec +++ b/gappalib-coq.spec @@ -1,19 +1,20 @@ # TESTING NOTE: The testsuite requires that gappalib-coq be installed already. # Hence, we cannot run it on the koji builders. The maintainer should always -# install the package and run "make -C testsuite check" manually before -# committing. +# install the package and run "remake check" manually before committing. %global gappadir %{_libdir}/coq/user-contrib/Gappa %global coqver 8.5pl2 Name: gappalib-coq -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Coq support library for gappa License: LGPLv2+ URL: http://gappa.gforge.inria.fr/ -Source0: https://gforge.inria.fr/frs/download.php/file/36065/%{name}-%{version}.tar.gz +Source0: https://gforge.inria.fr/frs/download.php/file/36210/%{name}-%{version}.tar.gz +# Patch to work with camlp4 +Patch0: %{name}-camlp4.patch BuildRequires: coq = %{coqver} BuildRequires: flocq @@ -47,6 +48,7 @@ informational purposes. %prep %setup -q +%patch0 # Enable debuginfo sed -i 's/-pp/-g &/' Remakefile.in @@ -84,6 +86,9 @@ cp -p src/*.v %{buildroot}%{gappadir} %{gappadir}/*.v %changelog +* Thu Sep 29 2016 Jerry James - 1.3.1-1 +- New upstream release + * Fri Jul 22 2016 Jerry James - 1.3.0-1 - New upstream release diff --git a/sources b/sources index f11ea15..bf0324f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f26c588d5da23cb30d88ae372d96c5b2 gappalib-coq-1.3.0.tar.gz +984289243537a12fe67047440e277eb2 gappalib-coq-1.3.1.tar.gz