[zenon] Move the coq files back to /usr/share to avoid a dependency on coq. Add paper describing zenon to %d

[Jerry James]

commit f276a0bb611b0a54aaad8a5ddb0a2264b7bd9f35
Author: Jerry James <loganjerry at gmail.com>
Date:   Thu Jul 14 10:28:44 2011 -0600

    Move the coq files back to /usr/share to avoid a dependency on coq.
    Add paper describing zenon to %doc.

 .gitignore |    1 +
 sources    |    1 +
 zenon.spec |   31 +++++++++++++++++++------------
 3 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 637832f..af600fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /zenon-0.6.3.tar.bz2
+/zenlpar07.pdf
diff --git a/sources b/sources
index 018eb22..b667f71 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 d1d2a42e8d1b1e5eeed2f6ab8b034c49  zenon-0.6.3.tar.bz2
+068d0f86748914e2c0651f7978a17779  zenlpar07.pdf
diff --git a/zenon.spec b/zenon.spec
index 25052c6..0df78ad 100644
--- a/zenon.spec
+++ b/zenon.spec
@@ -4,17 +4,18 @@
 
 Name:		zenon
 Version:	0.6.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Automated theorem prover for first-order classical logic
 Group:		Applications/Engineering
 License:	BSD
 URL:		http://focal.inria.fr/zenon/
 Source0:	http://focal.inria.fr/zenon/zenon-%{version}.tar.bz2
-Source1:	zenon-tptp-COM003+2.p
-Source2:	zenon-tptp-ReadMe
+Source1:	http://focal.inria.fr/zenon/zenlpar07.pdf
+Source2:	zenon-tptp-COM003+2.p
+Source3:	zenon-tptp-ReadMe
 # Basic documentation (man pages). Submitted upstream 2008-07-25:
-Source3:	zenon.1
-Source4:	zenon-format.5
+Source4:	zenon.1
+Source5:	zenon-format.5
 
 BuildRequires:	coq
 BuildRequires:	ghostscript
@@ -34,13 +35,15 @@ reinserted into Coq specifications.  Zenon can also be extended.
 %prep
 %setup -q
 
+cp -p %{SOURCE1} .
+
 %build
 # The -libdir argument identifies where to put the coq files.
-./configure -prefix %{_prefix} -libdir %{_libdir}/coq/user-contrib -sum md5sum
+./configure -prefix %{_prefix} -libdir %{_datadir}/zenon -sum md5sum
 
 mkdir examples
-cp -p %{SOURCE1} examples/tptp-COM003+2.p
-cp -p %{SOURCE2} examples/tptp-ReadMe
+cp -p %{SOURCE2} examples/tptp-COM003+2.p
+cp -p %{SOURCE3} examples/tptp-ReadMe
 
 # Work around Makefile errors (fails if no ocamlopt, uses _bytecode_ otherwise)
 %if %opt
@@ -58,8 +61,8 @@ make install DESTDIR=%{buildroot}
 
 install -d %{buildroot}%{_mandir}/man1/
 install -d %{buildroot}%{_mandir}/man5/
-cp -p %{SOURCE3} %{buildroot}%{_mandir}/man1/
-cp -p %{SOURCE4} %{buildroot}%{_mandir}/man5/
+cp -p %{SOURCE4} %{buildroot}%{_mandir}/man1/
+cp -p %{SOURCE5} %{buildroot}%{_mandir}/man5/
 
 %check
 # Sanity test. Can we prove TPTP v3.4.2 test COM003+2 (the halting problem)?
@@ -74,13 +77,17 @@ else
 fi
 
 %files
-%doc LICENSE examples doc/*.png
+%doc LICENSE zenlpar07.pdf examples doc/*.png
 %{_bindir}/zenon
-%{_libdir}/coq/user-contrib/zenon
+%{_datadir}/zenon
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
 %changelog
+* Thu Jul 14 2011 Jerry James <loganjerry at gmail.com> - 0.6.3-2
+- Move the coq files back to /usr/share to avoid a dependency on coq
+- Add paper describing zenon to %%doc
+
 * Tue Jul 12 2011 Jerry James <loganjerry at gmail.com> - 0.6.3-1
 - New upstream release
 - Drop unnecessary spec file elements (BuildRoot, etc.)