[alt-ergo] Update to version 0.95.2. Web pages and downloads now hosted by ocamlpro.com. Add ocaml-findlib, oca

Fri Sep 20 16:25:32 UTC 2013

commit 2a676b279d298b10f4ead37b4649d06003bb1a31
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Fri Sep 20 10:24:53 2013 -0600

    Update to version 0.95.2.
    Web pages and downloads now hosted by ocamlpro.com.
    Add ocaml-findlib, ocaml-zarith, and gmp-devel BRs.
    Drop prelink BR; execstack is no longer set.
    Fix bogus changelog dates.

 .gitignore      |    2 +-
 README.alt-ergo |    8 --------
 alt-ergo.spec   |   54 +++++++++++++++++++++++++++++-------------------------
 sources         |    2 +-
 4 files changed, 31 insertions(+), 35 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 5dbc5aa..1e871b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/alt-ergo-0.95.1.tar.gz
+/alt-ergo-0.95.2.tar.gz
diff --git a/alt-ergo.spec b/alt-ergo.spec
index 84f693d..75d371d 100644
--- a/alt-ergo.spec
+++ b/alt-ergo.spec
@@ -5,23 +5,24 @@
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:		alt-ergo
-Version:	0.95.1
-Release:	4%{?dist}
+Version:	0.95.2
+Release:	1%{?dist}
 Summary:	Automated theorem prover including linear arithmetic
 License:	CeCILL-C
 
-URL:		http://alt-ergo.lri.fr/
-Source0:	http://alt-ergo.lri.fr/http/%{name}-%{version}/%{name}-%{version}.tar.gz
+URL:		http://alt-ergo.ocamlpro.com/
+Source0:	http://alt-ergo.ocamlpro.com/http/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1:	swap0_why.why
-Source2:	README.alt-ergo
-Source3:	%{name}.desktop
+Source2:	%{name}.desktop
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gmp-devel
 BuildRequires:	gtksourceview2-devel
 BuildRequires:	ocaml
+BuildRequires:	ocaml-findlib
 BuildRequires:	ocaml-lablgtk-devel
 BuildRequires:	ocaml-ocamlgraph-devel
-BuildRequires:	prelink
+BuildRequires:	ocaml-zarith-devel
 
 Requires(post):	coreutils
 
@@ -50,38 +51,34 @@ A graphical front end for the alt-ergo theorem prover.
 %prep
 %setup -q
 
-cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} .
+cp -p %{SOURCE1} %{SOURCE2} .
 
 # Set print_flag to false or invoking with -select
 # from "why" will pause every invocation :-(.
-sed -i -e 's/let print_flag = true/let print_flag = false/;' pruning.ml
+sed -i '/let print_flag =/s/true/false/' src/preprocess/pruning.ml
 
 # Harden the build due to network use
-sed -i 's/^OFLAGS =.*/& -ccopt -Wl,-z,relro,-z,now/' Makefile.in
+sed -i 's/^OFLAGS =.*/& -g -ccopt -Wl,-z,relro,-z,now/' Makefile.in
 
 %build
-./configure --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_datadir} --mandir=%{_mandir}
+%configure
 
 %if ! %{opt}
 %global opt_option OCAMLBEST=byte OCAMLC=ocamlc OCAMLLEX=ocamllex
 %else
-%global opt_option OCAMLBEST=opt OCAMLOPT='ocamlopt.opt -g'
+%global opt_option OCAMLBEST=opt OCAMLOPT=ocamlopt.opt
 %endif
 
 make %{opt_option}
 make %{opt_option} gui
 
-iconv -f ISO-8859-1 -t UTF-8 -o CeCILL-C.utf8 CeCILL-C
-touch -r CeCILL-C CeCILL-C.utf8
-mv -f CeCILL-C.utf8 CeCILL-C
-
-%if %{opt}
-execstack -c ./alt-ergo.opt
-%endif
+iconv -f ISO-8859-1 -t UTF-8 -o LICENSE.utf8 LICENSE
+touch -r LICENSE LICENSE.utf8
+mv -f LICENSE.utf8 LICENSE
 
 %install
 mkdir -p %{buildroot}%{_bindir}
-make %{opt_option} DESTDIR=%{buildroot} install
+make %{opt_option} DESTDIR=%{buildroot} install install-gui install-pack
 
 # Remove files we do not want installed
 rm -f %{buildroot}%{_datadir}/%{name}/*.{cmx,o}
@@ -103,13 +100,13 @@ update-desktop-database &> /dev/null || :
 %else
 %define altergo ./alt-ergo.byte
 %endif
-%{altergo} -arrays swap0_why.why
+%{altergo} swap0_why.why
 
 %files
 %{_bindir}/%{name}
-%{_datadir}/%{name}/
+%{_libdir}/ocaml/%{name}/
 %{_mandir}/man1/alt-ergo.1.*
-%doc README.alt-ergo COPYING CeCILL-C CHANGES
+%doc README.md COPYING CHANGES LICENSE
 
 %files gui
 %{_bindir}/altgr-ergo
@@ -117,6 +114,13 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/gtksourceview-2.0/language-specs/%{name}.lang
 
 %changelog
+* Fri Sep 20 2013 Jerry James <loganjerry at gmail.com> - 0.95.2-1
+- Update to version 0.95.2
+- Web pages and downloads now hosted by ocamlpro.com
+- Add ocaml-findlib, ocaml-zarith, and gmp-devel BRs
+- Drop prelink BR; execstack is no longer set
+- Fix bogus changelog dates
+
 * Sat Sep 14 2013 Richard W.M. Jones <rjones at redhat.com> - 0.95.1-4
 - Rebuild for OCaml 4.01.0.
 - Enable debuginfo.
@@ -150,7 +154,7 @@ update-desktop-database &> /dev/null || :
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Mon Jun 12 2012 Jerry James <loganjerry at gmail.com> - 0.94-4
+* Tue Jun 12 2012 Jerry James <loganjerry at gmail.com> - 0.94-4
 - Rebuild for OCaml 4.00.0
 
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94-3
@@ -186,7 +190,7 @@ update-desktop-database &> /dev/null || :
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.92.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Tue Oct 06 2010 David A. Wheeler <dwheeler at dwheeler.com> 0.92.1-1
+* Wed Oct 06 2010 David A. Wheeler <dwheeler at dwheeler.com> 0.92.1-1
 - Update to version 0.92.1. This means:
 - New built-in syntax for the theory of arrays
 - Fixes a bug in the arithmetic module
diff --git a/sources b/sources
index 78d910c..446dc46 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0f1cbfdae04f1c37853ed5fd10154ec  alt-ergo-0.95.1.tar.gz
+ab9c160f7ecb26aa2479f9169db9b869  alt-ergo-0.95.2.tar.gz
