[newlisp/f15] Updated version, email address and files listed twice

Tue Nov 8 22:10:37 UTC 2011

commit 8b8200d02f3396c0f55d2366dd4bf670e3be5029
Author: Nathan Owe <ndowens04ATgmailDOTcom>
Date:   Tue Nov 8 15:47:37 2011 -0600

    Updated version, email address and files listed twice

 newlisp.spec |   36 +++++++++++++++++++++---------------
 newlispdoc.1 |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 15 deletions(-)
---

diff --git a/newlisp.spec b/newlisp.spec
index 834ff40..7fc7f29 100644
--- a/newlisp.spec
+++ b/newlisp.spec
@@ -1,13 +1,14 @@
 Name:           newlisp
 Version:        10.3.3
-Release:        3%{?dist}
+Release:        1%{?dist}
 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
+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
 BuildRequires:  readline-devel  
        
 
@@ -18,12 +19,22 @@ applications.
 
 %prep
 %setup -q
-%patch0 -p1 -b .CFLAGS-override
-%patch1 -p1 -b .stop-binary-strip
+#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
 
 
 %build
 %configure
+# -pedantic -Wno-strict-aliasing -Wno-long-long
 CFLAGS="%{optflags} -c -DREADLINE -DSUPPORT_UTF8 -DLINUX" make %{?_smp_mflags}
 
 %install
@@ -34,7 +45,6 @@ make install_home HOME=%{buildroot}/usr/
 %files
 %doc %{_datadir}/doc/*
 %doc %{_datadir}/%{name}/init.lsp.example
-%attr(0755,-,-) %{_datadir}/%{name}/util/syntax.cgi
 %{_bindir}/%{name}
 %{_bindir}/newlispdoc
 %{_mandir}/man1/*
@@ -43,16 +53,12 @@ make install_home HOME=%{buildroot}/usr/
 %{_datadir}/%{name}/util
 
 
-%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
+%changelog
+* Tue Oct 08 2011 Nathan Owe <ndowens at fedoraproject.org> 10.3.3-1
+- Updated Email address in SPEC
+- Fixed file listed twice in %%files
+- Package updated to the latest stable version
 
 * Sun Jul 24 2011 Nathan Owe <ndowens04 at yahoo.com> 10.3.2-3
 - Updated License field to the correct license
diff --git a/newlispdoc.1 b/newlispdoc.1
new file mode 100644
index 0000000..1b613df
--- /dev/null
+++ b/newlispdoc.1
@@ -0,0 +1,51 @@
+.TH newlispdoc 1 "July 2011" "version 3.1" "Commandline Parameters"
+.SH NAME
+.B newlispdoc
+\- generate documentation from newLISP source comments
+.SH SYNOPSIS
+.B newlispdoc 
+[\-s] [\-d] lisp\-file1 [lisp\-file2 ...]
+
+.B newlispdoc
+[\-s] [\-d] [\-url] urls-file
+.SH DESCRIPTION
+newlispdoc is a commandline utility written in newLISP to generate HTML documentation from comments written in newLISP source files. Consult /usr/share/doc/newlisp/newLISPdoc.html for a detailed description on how to write comments usable for newlispdoc. The newlispdoc command should be executed from inside the directory where the newLISP source files can be found. The generated documetation files will have .html added to the name of the source file. An index.html page is generated, which is listing for each file links to all the documented functions. If the current directory contains the file newlispdoc.css, it will be used for formatting HTML output. For a sample see util/newlispdoc.css in the source distribution.
+.SH OPTIONS
+.TP
+\-s
+this option causes newlispdoc to also generate a syntax highlighted HTML file of the source. A link to this file will be present in the HTML documentation of this file. The generated file will have the added extension .src.html.
+.TP
+\-d
+also generate a link to the raw unformatted sourcefile.
+.TP
+lisp\-file
+is a commented newLISP source file from which a documentation file will be generated.
+.TP
+\-url
+this option is used to retrieve newLISP source files for documentation from remote locations.
+.TP
+urls-file
+is a file containing urls of newLISP source files, one url per line.
+.SH EXAMPLES
+.TP
+Generate all documentation form files in the current directory.
+.B newlispdoc
+afile.lsp bfile.lsp
+.PP
+.TP
+Generate documentation and syntax highlighted HTML versions from all lisp files in the current directory and also supply a download link.
+.B newlispdoc
+\-s -d *.lsp
+.TP
+Retrieve source files for documentation from remote locations. Each file is specified on one line in urls.txt with its http:// address.
+.B newlispdoc
+\-s \-url urls.txt
+.SH EXIT STATUS
+newlispdoc returns a zero exit status for normal exit or writes a usage message if not enough paramneters are supplied.
+.SH AUTHOR
+Lutz Mueller <lutz at nuevatec.com>
+.SH SEE ALSO
+newlisp(1) \- newlisp man page
+
+http://www.newlisp.org/ \-  the newLISP home page
+
