From 6e22617ed8a78ec898abf23bf3456535c483c903 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Mon, 8 Jul 2013 17:49:15 +0200
Subject: [PATCH] man page: update command line options

---
 xsane-0.999-man-page.patch | 109 +++++++++++++++++++++++++++++++++++++
 xsane.spec                 |   9 ++-
 2 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 xsane-0.999-man-page.patch

diff --git a/xsane-0.999-man-page.patch b/xsane-0.999-man-page.patch
new file mode 100644
index 0000000..169dad3
--- /dev/null
+++ b/xsane-0.999-man-page.patch
@@ -0,0 +1,109 @@
+From 2dbbd80a5fb80741729c7cd5027af058b9c08c2c Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Mon, 8 Jul 2013 17:46:06 +0200
+Subject: [PATCH] patch: man-page
+
+Squashed commit of the following:
+
+commit e1915d50b677458127a8ad1c7953ee1d2e2ce250
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Mon Jul 8 17:44:26 2013 +0200
+
+    xsane.man: update command line options
+---
+ doc/xsane.man | 29 ++++++++++++++++++++++++-----
+ 1 file changed, 24 insertions(+), 5 deletions(-)
+
+diff --git a/doc/xsane.man b/doc/xsane.man
+index ee363a8..38b453d 100644
+--- a/doc/xsane.man
++++ b/doc/xsane.man
+@@ -4,6 +4,7 @@
+ xsane - scanner frontend for SANE
+ .SH SYNOPSIS
+ .B xsane
++.RB [ --help | -h ]
+ .RB [ --version | -v ]
+ .RB [ --license | -l ]
+ .RB [ --device-settings
+@@ -13,8 +14,9 @@ xsane - scanner frontend for SANE
+ .RB [ --viewer | -V ]
+ .RB [ --save | -s ]
+ .RB [ --copy | -c ]
++.RB [ --multipage | -m ]
+ .RB [ --fax | -f ]
+-.RB [ --mail | -m ]
++.RB [ --email | -e ]
+ .RB [ --no-mode-selection | -n ]
+ .RB [ --Fixed | -F ]
+ .RB [ --Resizable | -R ]
+@@ -25,6 +27,7 @@ xsane - scanner frontend for SANE
+ .IR name ]
+ .RB [ --display
+ .IR d ]
++.RB [ --no-xshm ]
+ .RB [ --sync ]
+ .RI [ devicename ]
+ .SH DESCRIPTION
+@@ -121,6 +124,12 @@ and
+ .SH OPTIONS
+ .PP
+ If the
++.B --help
++or
++.B -h
++flag is given xsane displays a short help message and exits.
++.PP
++If the
+ .B --version
+ or
+ .B -v
+@@ -128,7 +137,7 @@ flag is given xsane prints a version information, some
+ information about gtk+ and gimp version it is compiled
+ against and lists the supported file formats, then it exits.
+ .PP
+-when the
++If the
+ .B --license
+ or
+ .B -l
+@@ -161,16 +170,22 @@ or
+ flag forces xsane to start in copy mode.
+ .PP
+ The
++.B --multipage
++or
++.B -m
++flag forces xsane to start in multipage mode.
++.PP
++The
+ .B --fax
+ or
+ .B -f
+ flag forces xsane to start in fax mode.
+ .PP
+ The
+-.B --mail
++.B --email
+ or
+-.B -m
+-flag forces xsane to start in mail mode.
++.B -e
++flag forces xsane to start in e-mail mode.
+ .PP
+ The
+ .B --no-mode-selection
+@@ -217,6 +232,10 @@ flag selects the X11 display used to present the graphical user-interface
+ for details).
+ .PP
+ The
++.B --no-xshm
++flag forces xsane not to use shared memory images.
++.PP
++The
+ .B --sync
+ flag requests a synchronous connection with the X11 server.  This is for
+ debugging purposes only.
+-- 
+1.8.3.1
+
diff --git a/xsane.spec b/xsane.spec
index 23d882b..19705d8 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -20,7 +20,7 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.999
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-256x256.png
 # use "xdg-open" instead of "netscape" to launch help browser
@@ -57,6 +57,9 @@ Patch8: xsane-0.998-wmclass.patch
 # partly distro-specific: customize desktop file
 # submitted to upstream (Oliver Rauch) via email, 2013-06-04
 Patch9: xsane-0.998-desktop-file.patch
+# man page: update command line options
+# submitted to upstream (Oliver Rauch) via email, 2013-07-08
+Patch10: xsane-0.999-man-page.patch
 # autoconf-generated files
 Patch100: xsane-0.999-1-autoconf.patch.bz2
 License: GPLv2+
@@ -119,6 +122,7 @@ done
 %patch7 -p1 -b .libpng
 %patch8 -p1 -b .wmclass
 %patch9 -p1 -b .desktop-file
+%patch10 -p1 -b .man-page
 
 %patch100 -p1 -b .autoconf
 
@@ -223,6 +227,9 @@ fi
 %{_datadir}/sane/xsane
 
 %changelog
+* Mon Jul 08 2013 Nils Philippsen <nils@redhat.com> - 0.999-4
+- man page: update command line options
+
 * Fri Jul 05 2013 Nils Philippsen <nils@redhat.com> - 0.999-3
 - fix no-file-selected patch: change working directories (#621778, fix by Pavel
   Polischouk)