[alt-ergo] Update to version 0.95. Add -install patch to fix installation failure.

[Jerry James]

commit a2e3a3fa010f5009d5dec55119af51f12805a246
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Mon Jan 14 14:26:51 2013 -0700

    Update to version 0.95.
    Add -install patch to fix installation failure.

 .gitignore             |    2 +-
 alt-ergo-install.patch |   20 ++++++++++++++++++++
 alt-ergo.spec          |   29 ++++++++++++-----------------
 sources                |    2 +-
 4 files changed, 34 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0b1c69..9499cf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/alt-ergo-0.94.tar.gz
+/alt-ergo-0.95.tar.gz
diff --git a/alt-ergo-install.patch b/alt-ergo-install.patch
new file mode 100644
index 0000000..84f481b
--- /dev/null
+++ b/alt-ergo-install.patch
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2013-01-11 08:04:58.000000000 -0700
++++ Makefile.in	2013-01-14 14:19:53.290520650 -0700
+@@ -37,6 +37,7 @@
+ exec_prefix=@exec_prefix@
+ BINDIR=$(DESTDIR)@bindir@
+ LIBDIR=$(DESTDIR)@libdir@/alt-ergo
++DATADIR=$(DESTDIR)@datadir@
+ 
+ # where to install the man page
+ MANDIR=$(DESTDIR)@mandir@
+@@ -231,7 +232,8 @@
+ 	cp -f $(NAME).$(OCAMLBEST) $(BINDIR)/$(NAME)$(EXE)
+ ifeq ($(ENABLEGUI),yes)
+ 	cp -f altgr-ergo.opt $(BINDIR)/altgr-ergo$(EXE)
+-	cp -f util/gtk-lang/alt-ergo.lang /usr/share/gtksourceview-2.0/language-specs/alt-ergo.lang
++	mkdir -p $(DATADIR)/gtksourceview-2.0/language-specs
++	cp -f util/gtk-lang/alt-ergo.lang $(DATADIR)/gtksourceview-2.0/language-specs/alt-ergo.lang
+ endif
+ 
+ install-pack: xpack pack
diff --git a/alt-ergo.spec b/alt-ergo.spec
index 51c3445..0530dae 100644
--- a/alt-ergo.spec
+++ b/alt-ergo.spec
@@ -6,17 +6,20 @@
 %define debug_package %{nil}
 
 Name:		alt-ergo
-Version:	0.94
-Release:	7%{?dist}
+Version:	0.95
+Release:	1%{?dist}
 Summary:	Automated theorem prover including linear arithmetic
 
 Group:		Applications/Engineering
 License:	CeCILL-C
 URL:		http://alt-ergo.lri.fr/
-Source0:	http://alt-ergo.lri.fr/http/%{name}-%{version}.tar.gz
+Source0:	http://alt-ergo.lri.fr/http/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1:	swap0_why.why
 Source2:	README.alt-ergo
 Source3:	%{name}.desktop
+# Sent upstream 14 Jan 2013.  Patch the Makefile to fix one place where it
+# fails to use DESTDIR.
+Patch0:         %{name}-install.patch
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gtksourceview2-devel
@@ -52,6 +55,7 @@ A graphical front end for the alt-ergo theorem prover.
 
 %prep
 %setup -q
+%patch0
 
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} .
 
@@ -82,24 +86,11 @@ execstack -c ./alt-ergo.opt
 
 %install
 mkdir -p %{buildroot}%{_bindir}
-make %{opt_option} BINDIR=%{buildroot}%{_bindir} LIBDIR=%{buildroot}%{_datadir}/%{name} MANDIR=%{buildroot}%{_mandir} install
+make %{opt_option} DESTDIR=%{buildroot} install
 
 # Remove files we do not want installed
 rm -f %{buildroot}%{_datadir}/%{name}/*.{cmx,o}
 
-# Have to install the GUI by hand due to hardcoded paths in the makefile
-%if %opt
-strip altgr-ergo.opt
-cp -p altgr-ergo.opt %{buildroot}%{_bindir}/altgr-ergo
-%else
-cp -p altgr-ergo.byte %{buildroot}%{_bindir}/altgr-ergo
-%endif
-
-# Install the gtksourceview2 support
-mkdir -p %{buildroot}%{_datadir}/gtksourceview-2.0/language-specs
-cp -p util/gtk-lang/alt-ergo.lang \
-      %{buildroot}%{_datadir}/gtksourceview-2.0/language-specs
-
 # Install the desktop file
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop
@@ -131,6 +122,10 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/gtksourceview-2.0/language-specs/%{name}.lang
 
 %changelog
+* Mon Jan 14 2013 Jerry James <loganjerry at gmail.com> - 0.95-1
+- Update to version 0.95
+- Add -install patch to fix installation failure
+
 * Wed Oct 17 2012 Jerry James <loganjerry at gmail.com> - 0.94-7
 - Rebuild for OCaml 4.00.1
 
diff --git a/sources b/sources
index 34115ac..9f2fe96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-796450fa0743c2205d729ccd246c6c17  alt-ergo-0.94.tar.gz
+1c5f8a19c505ccacdd6a6dfe3f046b5c  alt-ergo-0.95.tar.gz