From 5886585cc6f88201ab8352aadcd173ccabc8e16b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20G=C3=B6rig?= <jgorig@redhat.com>
Date: Fri, 14 Jan 2011 13:01:11 +0100
Subject: [PATCH] fixed typos in ascii-xfr manpage (#669098) fixed empty lines
 handling in configuration file (#669406)

---
 minicom-2.4-config-parse.patch | 12 ++++++++++++
 minicom-2.4-man-typo.patch     | 21 +++++++++++++++++++++
 minicom.spec                   | 10 +++++++++-
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 minicom-2.4-config-parse.patch
 create mode 100644 minicom-2.4-man-typo.patch

diff --git a/minicom-2.4-config-parse.patch b/minicom-2.4-config-parse.patch
new file mode 100644
index 0000000..6ce99eb
--- /dev/null
+++ b/minicom-2.4-config-parse.patch
@@ -0,0 +1,12 @@
+diff -r ba1114e2cb7b src/rwconf.c
+--- a/src/rwconf.c	Sun Jan 09 23:54:02 2011 +0100
++++ b/src/rwconf.c	Fri Jan 14 12:32:16 2011 +0100
+@@ -269,7 +269,7 @@
+     while (isspace(*s))
+       s++;
+ 
+-    if (!s || *s == '#')
++    if (*s == 0 || *s == '#')
+       continue;
+ 
+     /* Skip old 'pr' and 'pu' marks at the beginning of the line */
diff --git a/minicom-2.4-man-typo.patch b/minicom-2.4-man-typo.patch
new file mode 100644
index 0000000..c745789
--- /dev/null
+++ b/minicom-2.4-man-typo.patch
@@ -0,0 +1,21 @@
+diff -r ba1114e2cb7b man/ascii-xfr.1
+--- a/man/ascii-xfr.1	Sun Jan 09 23:54:02 2011 +0100
++++ b/man/ascii-xfr.1	Fri Jan 14 12:37:24 2011 +0100
+@@ -20,7 +20,7 @@
+ (End-Of-Line) character is transmitted as CRLF. When
+ receiving, the CR character is stripped from the incoming file.
+ The Control-Z (ASCII 26) character signals End-Of-File, if option \-e
+-is specified (unless you change it to Cotrol-D (ASCII 4) with \-d).
++is specified (unless you change it to Control-D (ASCII 4) with \-d).
+ .PP
+ \fBAscii-xfr\fP reads from \fIstdin\fP when receiving, and
+ sends data on \fIstdout\fP when sending. Some form of
+@@ -40,7 +40,7 @@
+ .IP \fB\-n\fP
+ Do not translate CR to CRLF and vice versa.
+ .IP \fB\-v\fP
+-Verbose: show tranfer statistics on the stderr output.
++Verbose: show transfer statistics on the stderr output.
+ .IP "\fB\-l\fP \fImilliseconds\fP"
+ When transmitting, pause for this delay after each line.
+ .IP "\fB\-c\fP \fImilliseconds\fP"
diff --git a/minicom.spec b/minicom.spec
index dafa4c9..ea1b039 100644
--- a/minicom.spec
+++ b/minicom.spec
@@ -1,7 +1,7 @@
 Summary: A text-based modem control and terminal emulation program
 Name: minicom
 Version: 2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://alioth.debian.org/projects/minicom/
 License: GPLv2+
 Group: Applications/Communications
@@ -19,6 +19,8 @@ Patch4: minicom-2.4-rh.patch
 Patch5: minicom-2.4-esc.patch
 Patch6: minicom-2.4-staticbuf.patch
 Patch7: minicom-2.4-config.patch
+Patch8: minicom-2.4-config-parse.patch
+Patch9: minicom-2.4-man-typo.patch
 
 %description
 Minicom is a simple text-based modem control and terminal emulation
@@ -35,6 +37,8 @@ language, and other features.
 %patch5 -p1 -b .esc
 %patch6 -p1 -b .staticbuf
 %patch7 -p1 -b .config
+%patch8 -p1 -b .config-parse
+%patch9 -p1 -b .man
 
 cp -pr doc doc_
 rm -f doc_/Makefile*
@@ -64,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jan 14 2011 Jan Görig <jgorig@redhat.com> 2.4-2
+- fixed typos in ascii-xfr manpage (#669098)
+- fixed empty lines handling in configuration file (#669406)
+
 * Tue Mar 9 2010 Jan Görig <jgorig@redhat.com> 2.4-1
 - update to 2.4
 - /etc/minicom.users removed by upstream