From 5cd9b7c5cfb3538f955c62aec827d52ea311cdae Mon Sep 17 00:00:00 2001
From: terjeros <terjeros@fedoraproject.org>
Date: Aug 22 2008 19:34:40 +0000
Subject: Sync with rawhide.


---

diff --git a/.cvsignore b/.cvsignore
index f8fc9fd..9147c6d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mathomatic-14.0.4.tar.bz2
+mathomatic-14.1.4.tar.bz2
diff --git a/mathomatic-14.1.4-build.patch b/mathomatic-14.1.4-build.patch
new file mode 100644
index 0000000..3b3b0cd
--- /dev/null
+++ b/mathomatic-14.1.4-build.patch
@@ -0,0 +1,22 @@
+diff -uNr -x '*~' mathomatic-14.1.4.orig/makefile mathomatic-14.1.4/makefile
+--- mathomatic-14.1.4.orig/makefile	2008-08-09 02:35:29.000000000 +0200
++++ mathomatic-14.1.4/makefile	2008-08-22 20:46:07.000000000 +0200
+@@ -2,7 +2,8 @@
+ # Currently uses gcc only options in CFLAGS, just remove them for other C compilers.
+ 
+ VERSION		= `cat VERSION`
+-CFLAGS		+= -O2 -Wuninitialized -Wunused -Wshadow -Wformat -Wparentheses # gcc specific flags
++OPTFLAGS	?= -O2
++CFLAGS		+= $(OPTFLAGS) -Wuninitialized -Wunused -Wshadow -Wformat -Wparentheses # gcc specific flags
+ CFLAGS		+= -DUNIX -DVERSION=\"$(VERSION)\" # C compiler flags
+ LIBS		+= -lm # libraries to link
+ 
+@@ -81,7 +82,7 @@
+ 	install -d $(docdir)/mathomatic/factorial
+ 	install -d $(prefix)/share/applications
+ 	install -d $(prefix)/share/pixmaps
+-	install -m 0755 -s $(AOUT) $(bindir)
++	install -m 0755 $(AOUT) $(bindir)
+ 	install -m 0644 $(MAN1) $(mandir)/man1
+ 	install -m 0644 $(DOCS) $(docdir)/mathomatic
+ 	install -m 0644 doc/* $(docdir)/mathomatic/html
diff --git a/mathomatic.spec b/mathomatic.spec
index fb671c2..ac512de 100644
--- a/mathomatic.spec
+++ b/mathomatic.spec
@@ -1,11 +1,12 @@
 Summary:       Small, portable symbolic math program
 Name:          mathomatic
-Version:       14.0.4
+Version:       14.1.4
 Release:       1%{?dist} 
 License:       LGPLv2
 Group:         Applications/Engineering
 URL:           http://www.mathomatic.org/
-Source:        http://www.panix.com/~gesslein/%{name}-%{version}.tar.bz2
+Source0:       http://www.panix.com/~gesslein/%{name}-%{version}.tar.bz2
+Patch0:        mathomatic-14.1.4-build.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils readline-devel
 
@@ -30,10 +31,10 @@ This package contains small math tools from mathomatic to
 
 %prep
 %setup -q
-%{__sed} -i -e "s/CFLAGS.*+= -O/CFLAGS += %{optflags}/" makefile 
+%patch0 -p1
 
 %build
-%{__make} %{?_smp_mflags} READLINE=1 prefix=%{_prefix}
+%{__make} %{?_smp_mflags} OPTFLAGS='%{optflags}' READLINE=1 prefix=%{_prefix} 
 
 pushd primes
 %{__make} %{?_smp_mflags} prefix=%{_prefix} CFLAGS="%{optflags}"
@@ -61,6 +62,7 @@ pushd primes
 %{_datadir}/applications/%{name}.desktop
 
 %files tools
+%defattr(-, root, root, -)
 %{_bindir}/matho-pascal
 %{_bindir}/matho-primes
 %{_bindir}/matho-sumsq
@@ -69,6 +71,10 @@ pushd primes
 %{_mandir}/man1/matho-sumsq.1*
 
 %changelog
+* Fri Aug 22 2008 Terje Rosten <terje.rosten@ntnu.no> - 14.1.4-1
+- 14.1.4
+- add build patch (add optflags, dont strip)
+
 * Wed Jun  4 2008 Terje Rosten <terje.rosten@ntnu.no> - 14.0.4-1
 - 14.0.4
 
diff --git a/sources b/sources
index b76eea1..553f781 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f16d109e578f8731e16530d81aa9dab  mathomatic-14.0.4.tar.bz2
+85f5c734d4843fe41127366b07066e7e  mathomatic-14.1.4.tar.bz2