From 6e381eedcb200a1ff4320e68d44e801f24802ab9 Mon Sep 17 00:00:00 2001
From: Terje R�sten <terje.rosten@ntnu.no>
Date: Jan 17 2011 14:06:09 +0000
Subject: - 15.4.0

- Add rmath (#661410)

---

diff --git a/.gitignore b/.gitignore
index fbb0cb3..38441d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 mathomatic-15.1.3.tar.bz2
 mathomatic-15.1.5.tar.bz2
 /mathomatic-15.3.2.tar.bz2
+/mathomatic-15.4.0.tar.bz2
diff --git a/mathomatic.spec b/mathomatic.spec
index bd50afb..c0a29f3 100644
--- a/mathomatic.spec
+++ b/mathomatic.spec
@@ -1,13 +1,18 @@
 Summary:       Small, portable symbolic math program
 Name:          mathomatic
-Version:       15.3.2
+Version:       15.4.0
 Release:       1%{?dist} 
 License:       LGPLv2
 Group:         Applications/Engineering
-URL:           http://www.mathomatic.org/
-Source0:       http://www.panix.com/~gesslein/%{name}-%{version}.tar.bz2
+URL:           http://www.mathomatic.org/math/
+Source0:       http://mathomatic.org/mathomatic-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils readline-devel htmldoc ImageMagick
+BuildRequires: desktop-file-utils 
+BuildRequires: readline-devel 
+BuildRequires: htmldoc 
+BuildRequires: ImageMagick
+Requires:      m4
+Requires:      rlwrap
 
 %description
 Mathomatic is a small, portable symbolic math program that can
@@ -39,7 +44,9 @@ pushd primes
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot} prefix=%{_prefix}
+%{__make} m4install-degrees DESTDIR=%{buildroot} prefix=%{_prefix}
+%{__ln_s} %{name}.1.gz %{buildroot}/%{_mandir}/man1/rmath.1.gz
+%{__ln_s} %{name}.1.gz %{buildroot}/%{_mandir}/man1/matho.1.gz
 %{__rm} -rf %{buildroot}%{_datadir}/doc/%{name}
 desktop-file-install --delete-original \
     --dir %{buildroot}%{_datadir}/applications  \
@@ -62,7 +69,11 @@ pushd primes
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING README.txt changes.txt doc
 %{_bindir}/%{name}
+%{_bindir}/rmath
+%{_bindir}/matho
 %{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/rmath.1*
+%{_mandir}/man1/matho.1*
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
 
@@ -82,6 +93,10 @@ pushd primes
 %{_mandir}/man1/primorial.1*
 
 %changelog
+* Mon Jan 17 2011 Terje Rosten <terje.rosten@ntnu.no> - 15.4.0-1
+- 15.4.0
+- Add rmath (#661410)
+
 * Fri Nov  5 2010 Terje Rosten <terje.rosten@ntnu.no> - 15.3.2-1
 - 15.3.2
 
diff --git a/sources b/sources
index 537bbda..124bc64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8702315059db68d47b9e1b4e49990685  mathomatic-15.3.2.tar.bz2
+bba993114a35b5cf09022988d2d5d7dd  mathomatic-15.4.0.tar.bz2