[newlisp] Re-added patches with updated newlisp

[ndowens]

commit bf5309043dd22d4de93f9e8c371fa33ba7195b3b
Author: Nathan Owe <ndowens at revan.linux>
Date:   Thu Sep 22 13:21:53 2011 -0500

    Re-added patches with updated newlisp

 newlisp-0002-Allow-to-override-CFLAGS.patch        |   40 ++++++++++++++++++++
 ...isp-0003-Don-t-strip-the-resulting-binary.patch |   38 +++++++++++++++++++
 newlisp.spec                                       |   13 ++++++-
 3 files changed, 90 insertions(+), 1 deletions(-)
---
diff --git a/newlisp-0002-Allow-to-override-CFLAGS.patch b/newlisp-0002-Allow-to-override-CFLAGS.patch
new file mode 100644
index 0000000..2cd17dc
--- /dev/null
+++ b/newlisp-0002-Allow-to-override-CFLAGS.patch
@@ -0,0 +1,40 @@
+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-0003-Don-t-strip-the-resulting-binary.patch b/newlisp-0003-Don-t-strip-the-resulting-binary.patch
new file mode 100644
index 0000000..a0aa3ea
--- /dev/null
+++ b/newlisp-0003-Don-t-strip-the-resulting-binary.patch
@@ -0,0 +1,38 @@
+From 77cd198d691ee28e3efb097850120e74b3b403b4 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Sun, 24 Jul 2011 13:20:06 +0400
+Subject: [PATCH 3/3] Don't strip the resulting binary
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ makefile_linuxLP64_utf8 |    1 -
+ makefile_linux_utf8     |    1 -
+ 2 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/makefile_linuxLP64_utf8 b/makefile_linuxLP64_utf8
+index 9458501..6171efe 100644
+--- a/makefile_linuxLP64_utf8
++++ b/makefile_linuxLP64_utf8
+@@ -15,7 +15,6 @@ default: $(OBJS)
+ #	$(CC) $(OBJS) -m64 -g -lm -ldl -lreadline -ltermcap -o newlisp # slackware
+ #	$(CC) $(OBJS) -m64 -g -lm -ldl -lreadline -lncurses -o newlisp # other Linux Dist
+ #	$(CC) $(OBJS) -m64 -g -lm -ldl -o newlisp # without readline support
+-	strip newlisp
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $<
+diff --git a/makefile_linux_utf8 b/makefile_linux_utf8
+index e05cdcc..7a30291 100644
+--- a/makefile_linux_utf8
++++ b/makefile_linux_utf8
+@@ -15,7 +15,6 @@ default: $(OBJS)
+ #	$(CC) $(OBJS) -m32 -g -lm -ldl -lreadline -ltermcap -o newlisp # slackware
+ #	$(CC) $(OBJS) -m32 -g -lm -ldl -lreadline -lncurses -o newlisp # other Linux Dist
+ #	$(CC) $(OBJS) -m32 -g -lm -ldl -o newlisp # without readline support
+-	strip newlisp
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $<
+-- 
+1.7.6
+
diff --git a/newlisp.spec b/newlisp.spec
index 5259dfe..834ff40 100644
--- a/newlisp.spec
+++ b/newlisp.spec
@@ -6,6 +6,8 @@ Summary:        Lisp-like general purpose scripting
 License:        GPLv3+
 URL:            http://www.newlisp.org
 Source0:        http://www.newlisp.org/downloads/%{name}-%{version}.tgz
+Patch0:         %{name}-0002-Allow-to-override-CFLAGS.patch
+Patch1:         %{name}-0003-Don-t-strip-the-resulting-binary.patch
 BuildRequires:  readline-devel  
        
 
@@ -16,11 +18,14 @@ applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .CFLAGS-override
+%patch1 -p1 -b .stop-binary-strip
 
 
 %build
 %configure
-CFLAGS="%{optflags}" make %{?_smp_mflags}
+CFLAGS="%{optflags} -c -DREADLINE -DSUPPORT_UTF8 -DLINUX" make %{?_smp_mflags}
+
 %install
 rm -rf %{buildroot}
 make install_home HOME=%{buildroot}/usr/
@@ -39,6 +44,12 @@ make install_home HOME=%{buildroot}/usr/
 
 
 %changelog
+* Thu Sep 22 2011 Nathan Owe <ndowens at fedoraproject dot org> 10.3.3-3
+- Re-added patches, didn't think they were no longer needed
+
+* Thu Sep 22 2011 Nathan Owe <ndowens at fedoraproject dot org> 10.3.3-2
+- Removed patches
+
 * Thu Sep 22 2011 Nathan Owe <ndowens at fedoraproject dot org> 10.3.3-1
 - Updated version
 - Updated email address