[newlisp/f16] modified: newlisp-0002-Allow-to-override-CFLAGS.patch modified: newlisp.spec

[ndowens]

commit 90b4e31956056631a290fbebb24094dbe499a3a9
Author: Nathan Owens <ndowens04 at gmail.com>
Date:   Tue Apr 17 19:20:38 2012 -0500

    	modified:   newlisp-0002-Allow-to-override-CFLAGS.patch
    	modified:   newlisp.spec

 newlisp-0002-Allow-to-override-CFLAGS.patch |   40 ---------------------------
 newlisp.spec                                |   14 +++++++--
 2 files changed, 11 insertions(+), 43 deletions(-)
---
diff --git a/newlisp-0002-Allow-to-override-CFLAGS.patch b/newlisp-0002-Allow-to-override-CFLAGS.patch
index 2cd17dc..e69de29 100644
--- a/newlisp-0002-Allow-to-override-CFLAGS.patch
+++ b/newlisp-0002-Allow-to-override-CFLAGS.patch
@@ -1,40 +0,0 @@
-From f1a1f39234076f15e243bdddf48ffc654037a6a5 Mon Sep 17 00:00:00 2001
-From: Peter Lemenkov <lemenkov at gmail.com>
-Date: Sun, 24 Jul 2011 12:57:38 +0400
-Subject: [PATCH 2/3] Allow to override CFLAGS
-
-Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
----
- makefile_linuxLP64_utf8 |    2 +-
- makefile_linux_utf8     |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/makefile_linuxLP64_utf8 b/makefile_linuxLP64_utf8
-index abccae3..9458501 100644
---- a/makefile_linuxLP64_utf8
-+++ b/makefile_linuxLP64_utf8
-@@ -6,7 +6,7 @@
- OBJS = newlisp.o nl-symbol.o nl-math.o nl-list.o nl-liststr.o nl-string.o nl-filesys.o \
- 	nl-sock.o nl-import.o nl-xml.o nl-web.o nl-matrix.o nl-debug.o nl-utf8.o pcre.o
- 
--CFLAGS = -fPIC -m64 -Wall -pedantic -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DNEWLISP64 -DLINUX
-+CFLAGS ?= -fPIC -m64 -Wall -pedantic -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DNEWLISP64 -DLINUX
- 
- CC = gcc
- 
-diff --git a/makefile_linux_utf8 b/makefile_linux_utf8
-index 21ec7bd..e05cdcc 100644
---- a/makefile_linux_utf8
-+++ b/makefile_linux_utf8
-@@ -6,7 +6,7 @@
- OBJS = newlisp.o nl-symbol.o nl-math.o nl-list.o nl-liststr.o nl-string.o nl-filesys.o \
- 	nl-sock.o nl-import.o nl-xml.o nl-web.o nl-matrix.o nl-debug.o nl-utf8.o pcre.o
- 
--CFLAGS = -m32 -Wall -pedantic -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DLINUX
-+CFLAGS ?= -m32 -Wall -pedantic -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DLINUX
- 
- CC = gcc
- 
--- 
-1.7.6
-
diff --git a/newlisp.spec b/newlisp.spec
index 4b4076a..38fce72 100644
--- a/newlisp.spec
+++ b/newlisp.spec
@@ -1,6 +1,6 @@
 Name:           newlisp
 Version:        10.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lisp-like general purpose scripting
 
 License:        GPLv3+
@@ -24,12 +24,16 @@ applications.
 %build
 %configure
 
+#Specify on supported platforms
+sed -i.m32 's/\-m32 //' makefile_linux
+sed -i.m64 's/\-m64 //' makefile_linuxLP64
+
 %ifarch x86_64
-CFLAGS="%{optflags} -c -DREADLINE -DSUPPORT_UTF8 -DLINUX" \
+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
 
@@ -54,6 +58,10 @@ make install_home HOME=%{buildroot}/usr/
 
 
 %changelog
+* Apr 17 2012 Nathan Owe <ndowens at fedoraproject.org> 10.4.0-2
+- Added patch for ARM support
+- Fixed mixed spaces and tabs error
+
 * Sat Apr 07 2012 Nathan Owe <ndowens at fedoraproject.org> 10.4.0-1
 - Updated version