[newlisp/f15] Updated version and including missing patch

[ndowens]

commit d5a32e95c1bd8938889a92e42bb04faa2a9f65b9
Author: ndowens <ndowens at Nathan.Linux>
Date:   Fri May 4 20:59:49 2012 -0500

    Updated version and including missing patch

 .gitignore   |    1 +
 newlisp.spec |   30 +++++++++++++++++++++++++++---
 sources      |    2 +-
 3 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd6b45e..8793f5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 >>>>>>> master
 /newlisp-10.4.0.tgz
 /newlisp-10.4.1.tgz
+/newlisp-10.4.2.tgz
diff --git a/newlisp.spec b/newlisp.spec
index 4b4076a..c36b064 100644
--- a/newlisp.spec
+++ b/newlisp.spec
@@ -1,5 +1,5 @@
 Name:           newlisp
-Version:        10.4.0
+Version:        10.4.2
 Release:        1%{?dist}
 Summary:        Lisp-like general purpose scripting
 
@@ -21,20 +21,31 @@ applications.
 %patch0 -p1 -b .CFLAGS-override
 %patch1 -p1 -b .stop-binary-strip
 
+# Remove it from the general build and specify it on supported platforms below
+sed -i.m32 's/\-m32 //' makefile_linux
+sed -i.m64 's/\-m64 //' makefile_linuxLP64
+
 %build
 %configure
 
 %ifarch x86_64
 CFLAGS="%{optflags} -c -DREADLINE -DSUPPORT_UTF8 -DLINUX" \
+        make -f makefile_linuxLP64 %{?_smp_mflags}
+
+CFLAGS="%{optflags} -m64 -c -DREADLINE -DSUPPORT_UTF8 -DLINUX" \
 	make -f makefile_linuxLP64 %{?_smp_mflags}
 %endif
+
 %ifarch %{ix86}
-CFLAGS="%{optflags} -c -DREADLINE -DSUPPORT_UTF8 -DLINUX" \
+CFLAGS="%{optflags} -m32 -c -DREADLINE -DSUPPORT_UTF8 -DLINUX" \
 	make -f makefile_linux %{?_smp_mflags}
 %endif
+%ifarch %{arm}
+CFLAGS="%{optflags} -c -DREADLINE -DSUPPORT_UTF8 -DLINUX" \
+        make -f makefile_linux %{?_smp_mflags}
+%endif
 
 %install
-rm -rf %{buildroot}
 make install_home HOME=%{buildroot}/usr/
 
 
@@ -54,6 +65,19 @@ make install_home HOME=%{buildroot}/usr/
 
 
 %changelog
+* Fri May 04 2012 Nathan Owe <ndowens at fedoraproject.org> 10.4.2-1
+- Fixes missing RPM_OPT_FLAGS (bug #815529)
+- Updated version (bug #818145)
+
+* Tue Apr 17 2012 Nathan Owe <ndowens at fedoraproject.org> 10.4.0-4
+- Rebuild with updated Allow-override-CFLAGS patch
+
+* Tue Apr 17 2012 Nathan Owe <ndowens at fedoraproject.org> 10.4.0-3
+- Fixed mixed-tabs-and-spaces warning
+
+* Mon Apr 16 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 10.4.0-2
+- Fix building from ARM
+
 * Sat Apr 07 2012 Nathan Owe <ndowens at fedoraproject.org> 10.4.0-1
 - Updated version
 
diff --git a/sources b/sources
index 92a8b2f..94bca0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a56ed9130a403520b08059f17b81965a  newlisp-10.4.0.tgz
+97a3b822e33ccefe7fad36d56371392c  newlisp-10.4.2.tgz