[newlisp/f15] Update due to <<<Head in SPEC file

Thu Sep 22 18:55:58 UTC 2011

commit 93c5892d1d62d94d25f6511625a3fcd51e15e7f9
Author: Nathan Owe <ndowens at revan.linux>
Date:   Thu Sep 22 13:55:33 2011 -0500

    Update due to <<<Head in SPEC file

 newlisp.spec |   40 ----------------------------------------
 1 files changed, 0 insertions(+), 40 deletions(-)
---

diff --git a/newlisp.spec b/newlisp.spec
index 7405038..834ff40 100644
--- a/newlisp.spec
+++ b/newlisp.spec
@@ -1,23 +1,13 @@
 Name:           newlisp
-<<<<<<< HEAD
-Version:        10.3.2
-=======
 Version:        10.3.3
->>>>>>> master
 Release:        3%{?dist}
 Summary:        Lisp-like general purpose scripting
 
 License:        GPLv3+
 URL:            http://www.newlisp.org
 Source0:        http://www.newlisp.org/downloads/%{name}-%{version}.tgz
-<<<<<<< HEAD
-Source1:	http://www.newlisp.org/downloads/development/inprogress/newlispdoc.1
-Patch2:         newlisp-0002-Allow-to-override-CFLAGS.patch
-Patch3:         newlisp-0003-Don-t-strip-the-resulting-binary.patch
-=======
 Patch0:         %{name}-0002-Allow-to-override-CFLAGS.patch
 Patch1:         %{name}-0003-Don-t-strip-the-resulting-binary.patch
->>>>>>> master
 BuildRequires:  readline-devel  
        
 
@@ -28,30 +18,12 @@ applications.
 
 %prep
 %setup -q
-<<<<<<< HEAD
-#Install fixed Man page
-install -Dm644 %{SOURCE1} doc/newlispdoc.1
-
-#Non-exec file has shebang
-sed -i 's|#!/usr/bin/newlisp||g' modules/json.lsp
-sed -i 's|#!/usr/bin/newlisp||g' util/syntax.cgi
-
-# Allow to override CFLAGS (Fedora-specific mostly)
-%patch2 -p1 -b .override_cflags
-# Don't strip the resulting binary (Fedora-specific)
-%patch3 -p1 -b .dont_strip
-=======
 %patch0 -p1 -b .CFLAGS-override
 %patch1 -p1 -b .stop-binary-strip
->>>>>>> master
 
 
 %build
 %configure
-<<<<<<< HEAD
-# -pedantic -Wno-strict-aliasing -Wno-long-long
-=======
->>>>>>> master
 CFLAGS="%{optflags} -c -DREADLINE -DSUPPORT_UTF8 -DLINUX" make %{?_smp_mflags}
 
 %install
@@ -62,10 +34,7 @@ make install_home HOME=%{buildroot}/usr/
 %files
 %doc %{_datadir}/doc/*
 %doc %{_datadir}/%{name}/init.lsp.example
-<<<<<<< HEAD
-=======
 %attr(0755,-,-) %{_datadir}/%{name}/util/syntax.cgi
->>>>>>> master
 %{_bindir}/%{name}
 %{_bindir}/newlispdoc
 %{_mandir}/man1/*
@@ -74,14 +43,6 @@ make install_home HOME=%{buildroot}/usr/
 %{_datadir}/%{name}/util
 
 
-<<<<<<< HEAD
-
-%changelog
-* Sun Jul 24 2011 Nathan Owe <ndowens04 at yahoo.com> 10.3.2-3
-- Updated License field to the correct license
-* Sun Jul 24 2011 Nathan Owe <ndowens04 at yahoo.com> 10.3.2-2
-- Added fixed Man page from SCM 
-=======
 %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
@@ -99,6 +60,5 @@ make install_home HOME=%{buildroot}/usr/
 * Sun Jul 24 2011 Nathan Owe <ndowens04 at yahoo.com> 10.3.2-2
 - Added fixed Man page from SCM 
 
->>>>>>> master
 * Thu Jul 21 2011 Nathan Owe <ndowens04 at yahoo.com> 10.3.2-1
 - Initial package
