[newlisp/f17: 2/2] Merge branch 'f17' of ssh://pkgs.fedoraproject.org/newlisp into f17

[ndowens]

commit 25976e536381d5e4a6685a23536f6a3117835b98
Merge: 24d3cce 114f854
Author: Nathan Owens <ndowens04 at gmail.com>
Date:   Tue Apr 17 17:40:45 2012 -0500

    Merge branch 'f17' of ssh://pkgs.fedoraproject.org/newlisp into f17
    
    Conflicts:
    	newlisp.spec

 newlisp-0002-Allow-to-override-CFLAGS.patch |    4 ++--
 newlisp.spec                                |   21 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --cc newlisp.spec
index e55d676,c36311a..0d4077c
--- a/newlisp.spec
+++ b/newlisp.spec
@@@ -1,6 -1,6 +1,10 @@@
  Name:           newlisp
  Version:        10.4.0
++<<<<<<< HEAD
 +Release:        3%{?dist}
++=======
+ Release:        2%{?dist}
++>>>>>>> 114f85454650d1de502e51367a30dd9034d4498d
  Summary:        Lisp-like general purpose scripting
  
  License:        GPLv3+
@@@ -25,13 -29,16 +33,22 @@@ sed -i.m64 's/\-m64 //' makefile_linuxL
  %configure
  
  %ifarch x86_64
++<<<<<<< HEAD
 +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}
++>>>>>>> 114f85454650d1de502e51367a30dd9034d4498d
  %endif
 +
  %ifarch %{ix86}
+ 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}
 +        make -f makefile_linux %{?_smp_mflags}
  %endif
  
  %install