[zenon] New upstream release. Sources for the icon are no longer provided. Fix license handling.

[Jerry James]

commit 573b83a565cc07e05a079b7fef0eb0b21fb4f397
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Thu Oct 23 11:48:29 2014 -0600

    New upstream release.
    Sources for the icon are no longer provided.
    Fix license handling.

 .gitignore |    2 +-
 sources    |    2 +-
 zenon.spec |   51 ++++++++++++++++++++-------------------------------
 3 files changed, 22 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c044905..cad1d02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /zenlpar07.pdf
-/zenon-0.7.1.tar.xz
+/zenon-0.8.0.tar.gz
diff --git a/sources b/sources
index a944038..67cbe8b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cb8b35e2d55dabcc7d8a1e8b3600f68a  zenon-0.7.1.tar.xz
+4d82ae5b6dc498a73ef85a353c5da325  zenon-0.8.0.tar.gz
 068d0f86748914e2c0651f7978a17779  zenlpar07.pdf
diff --git a/zenon.spec b/zenon.spec
index eb44737..12718aa 100644
--- a/zenon.spec
+++ b/zenon.spec
@@ -1,14 +1,17 @@
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%if !%{opt}
+%global debug_package %{nil}
+%endif
 
 Name:		zenon
-Version:	0.7.1
-Release:	14%{?dist}
+Version:	0.8.0
+Release:	1%{?dist}
 Summary:	Automated theorem prover for first-order classical logic
 Group:		Applications/Engineering
 License:	BSD
-URL:		http://focal.inria.fr/%{name}/
-Source0:	http://focal.inria.fr/%{name}/%{name}-%{version}.tar.xz
-Source1:	http://focal.inria.fr/%{name}/zenlpar07.pdf
+URL:		http://sosie.inria.fr/
+Source0:	http://sosie.inria.fr/%{name}-%{version}.tar.gz
+Source1:	http://sosie.inria.fr/zenlpar07.pdf
 Source2:	%{name}-tptp-COM003+2.p
 Source3:	%{name}-tptp-ReadMe
 # Basic documentation (man pages). Submitted upstream 2008-07-25:
@@ -31,28 +34,15 @@ generate Coq proofs (proof scripts or proof terms), which can be
 reinserted into Coq specifications.  Zenon can also be extended.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 
 cp -p %{SOURCE1} .
 
-# Fool a script that tries to detect writable directories at config time
-sed -i 's/test -w/test -r/' configure
+# Generate debuginfo and don't error out on a warning
+sed -i 's/^\(CAMLFLAGS = \).*/\1-g/' Makefile
 
 %build
-LIB_DIR=%{_datadir}/%{name} \
-DOC_DIR=%{_defaultdocdir} \
-MAN_DIR=%{_mandir}/man1 \
-TOOLS_PROJECT_LIB_DIR=%{_libdir} \
-TOOLS_PROJECT_MAN_DIR=%{_mandir} \
-TOOLS_PROJECT_DOC_DIR=%{_defaultdocdir} \
-CAML_LIB_DIR=%{_libdir}/ocaml \
-COQ_LIB_DIR=%{_libdir}/coq \
-ZENON_LIB_DIR=%{_datadir}/%{name} \
-ZVTOV_LIB_DIR=%{_datadir}/zvtov \
-BYT_DEBUG_FLAGS=-g \
-BIN_DEBUG_FLAGS=-g \
-./configure -prefix %{_prefix} -tools_prefix %{_prefix} -coq_rc '~/.coqrc' \
-  -sum md5sum
+./configure -prefix %{_prefix} -libdir %{_datadir}/%{name} -sum md5sum
 
 mkdir examples
 cp -p %{SOURCE2} examples/tptp-COM003+2.p
@@ -66,7 +56,6 @@ cp -p %{SOURCE3} examples/tptp-ReadMe
   make %{?_smp_mflags} zenon.byt coq
   cp -p zenon.byt zenon
 %endif
-make -C doc zenon-logo-small.png
 
 %install
 make install DESTDIR=%{buildroot}
@@ -76,15 +65,9 @@ install -d %{buildroot}%{_mandir}/man5/
 cp -p %{SOURCE4} %{buildroot}%{_mandir}/man1/
 cp -p %{SOURCE5} %{buildroot}%{_mandir}/man5/
 
-# Remove a symlink and just install the real binary
-rm -f %{buildroot}%{_bindir}/%{name}
-mv %{buildroot}%{_bindir}/%{name}-%{version} %{buildroot}%{_bindir}/%{name}
-
 # Put the coq files where coq can find them
 mkdir -p %{buildroot}%{_libdir}/coq/user-contrib
-mv %{buildroot}%{_datadir}/%{name}/%{name}-%{version} \
-   %{buildroot}%{_libdir}/coq/user-contrib/Zenon
-rm -fr %{buildroot}%{_datadir}/%{name}
+mv %{buildroot}%{_datadir}/%{name} %{buildroot}%{_libdir}/coq/user-contrib/Zenon
 
 %check
 # Sanity test. Can we prove TPTP v3.4.2 test COM003+2 (the halting problem)?
@@ -99,13 +82,19 @@ else
 fi
 
 %files
-%doc LICENSE zenlpar07.pdf examples doc/*.png
+%doc zenlpar07.pdf examples
+%license LICENSE
 %{_bindir}/%{name}
 %{_libdir}/coq/user-contrib/Zenon
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
 %changelog
+* Thu Oct 23 2014 Jerry James <loganjerry at gmail.com> - 0.8.0-1
+- New upstream release
+- Sources for the icon are no longer provided
+- Fix license handling
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild