[mathomatic] - 15.3.2

[terjeros]

commit 04d00b4f7f3b8b6e8f9dbee5afe021a50e3cf374
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Fri Nov 5 17:51:27 2010 +0100

    - 15.3.2

 .gitignore      |    1 +
 mathomatic.spec |   15 ++++++++++-----
 sources         |    2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ba6b1a8..fbb0cb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 mathomatic-15.1.3.tar.bz2
 mathomatic-15.1.5.tar.bz2
+/mathomatic-15.3.2.tar.bz2
diff --git a/mathomatic.spec b/mathomatic.spec
index 2c1a64a..bd50afb 100644
--- a/mathomatic.spec
+++ b/mathomatic.spec
@@ -1,13 +1,13 @@
 Summary:       Small, portable symbolic math program
 Name:          mathomatic
-Version:       15.1.5
+Version:       15.3.2
 Release:       1%{?dist} 
 License:       LGPLv2
 Group:         Applications/Engineering
 URL:           http://www.mathomatic.org/
 Source0:       http://www.panix.com/~gesslein/%{name}-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils readline-devel
+BuildRequires: desktop-file-utils readline-devel htmldoc ImageMagick
 
 %description
 Mathomatic is a small, portable symbolic math program that can
@@ -33,20 +33,22 @@ This package contains small math tools from mathomatic to
 
 %build
 %{__make} %{?_smp_mflags} OPTFLAGS="%{optflags}" READLINE=1 prefix=%{_prefix} 
-
+%{__make} pdf
 pushd primes
 %{__make} %{?_smp_mflags} prefix=%{_prefix} CFLAGS="%{optflags}"
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install prefix=%{buildroot}%{_prefix} mandir=%{buildroot}%{_mandir}
+%{__make} install DESTDIR=%{buildroot} prefix=%{_prefix}
 %{__rm} -rf %{buildroot}%{_datadir}/doc/%{name}
 desktop-file-install --delete-original \
     --dir %{buildroot}%{_datadir}/applications  \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
-
 pushd primes
 %{__make} install prefix=%{buildroot}%{_prefix} mandir=%{buildroot}%{_mandir}
+convert  %{buildroot}%{_datadir}/pixmaps/%{name}.xpm \
+         %{buildroot}%{_datadir}/pixmaps/%{name}.png
+%{__rm} -f %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
 
 %check
 %{__make} test
@@ -80,6 +82,9 @@ pushd primes
 %{_mandir}/man1/primorial.1*
 
 %changelog
+* Fri Nov  5 2010 Terje Rosten <terje.rosten at ntnu.no> - 15.3.2-1
+- 15.3.2
+
 * Sat Jul 31 2010 Terje Rosten <terje.rosten at ntnu.no> - 15.1.5-1
 - 15.1.5
 
diff --git a/sources b/sources
index 88ef230..537bbda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0899378d57fc3cc4dc1943f108d8774d  mathomatic-15.1.5.tar.bz2
+8702315059db68d47b9e1b4e49990685  mathomatic-15.3.2.tar.bz2