rpms/mathomatic/F-9 mathomatic-14.1.4-build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mathomatic.spec, 1.1, 1.2 sources, 1.2, 1.3

[Terje Røsten]

Author: terjeros

Update of /cvs/extras/rpms/mathomatic/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28176/F-9

Modified Files:
	.cvsignore mathomatic.spec sources 
Added Files:
	mathomatic-14.1.4-build.patch 
Log Message:
Sync with rawhide.



mathomatic-14.1.4-build.patch:

--- NEW FILE mathomatic-14.1.4-build.patch ---
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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jun 2008 18:15:48 -0000	1.2
+++ .cvsignore	22 Aug 2008 19:34:40 -0000	1.3
@@ -1 +1 @@
-mathomatic-14.0.4.tar.bz2
+mathomatic-14.1.4.tar.bz2


Index: mathomatic.spec
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-9/mathomatic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mathomatic.spec	9 Jun 2008 18:15:48 -0000	1.1
+++ mathomatic.spec	22 Aug 2008 19:34:40 -0000	1.2
@@ -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 @@
 
 %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 @@
 %{_datadir}/applications/%{name}.desktop
 
 %files tools
+%defattr(-, root, root, -)
 %{_bindir}/matho-pascal
 %{_bindir}/matho-primes
 %{_bindir}/matho-sumsq
@@ -69,6 +71,10 @@
 %{_mandir}/man1/matho-sumsq.1*
 
 %changelog
+* Fri Aug 22 2008 Terje Rosten <terje.rosten at ntnu.no> - 14.1.4-1
+- 14.1.4
+- add build patch (add optflags, dont strip)
+
 * Wed Jun  4 2008 Terje Rosten <terje.rosten at ntnu.no> - 14.0.4-1
 - 14.0.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jun 2008 18:15:48 -0000	1.2
+++ sources	22 Aug 2008 19:34:40 -0000	1.3
@@ -1 +1 @@
-1f16d109e578f8731e16530d81aa9dab  mathomatic-14.0.4.tar.bz2
+85f5c734d4843fe41127366b07066e7e  mathomatic-14.1.4.tar.bz2