diff --git a/sane-frontends-1.0.14-xcam-man.patch b/sane-frontends-1.0.14-xcam-man.patch new file mode 100644 index 0000000..c28ec3a --- /dev/null +++ b/sane-frontends-1.0.14-xcam-man.patch @@ -0,0 +1,43 @@ +From 3ec2c43dc3ef177cc2be266881892ec7d23753fe Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Mon, 8 Jul 2013 16:35:03 +0200 +Subject: [PATCH] patch: xcam-man + +Squashed commit of the following: + +commit 6b21756dac4f6ddce5beb0aaf0b135ab882b9cfa +Author: Nils Philippsen +Date: Mon Jul 8 16:28:30 2013 +0200 + + describe correct option names in xcam man page + + (cherry picked from commit 7e079e377174826453a1041719fb347d69d3ba5f) +--- + doc/xcam.man | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/xcam.man b/doc/xcam.man +index 036bcb3..020445e 100644 +--- a/doc/xcam.man ++++ b/doc/xcam.man +@@ -4,7 +4,7 @@ + xcam - a graphical camera frontend for SANE + .SH SYNOPSIS + .B xcam +-.RB [ --buffer | -B ] ++.RB [ --buffersize | -B ] + .RB [ --version | -V ] + .RB [ --help | -h ] + +@@ -30,7 +30,7 @@ presents a menu listing of all known and available devices. + .SH OPTIONS + .PP + If the +-.B --Buffer (-B) ++.B --buffersize (-B) + option is given, + .B xcam + will use a 1024 kByte input buffer instead of the default 32 kByte. +-- +1.8.3.1 + diff --git a/sane-frontends.spec b/sane-frontends.spec index cb2f12a..5f6d291 100644 --- a/sane-frontends.spec +++ b/sane-frontends.spec @@ -12,6 +12,9 @@ Patch0: sane-frontends-1.0.14-array-out-of-bounds.patch # Upstream commit 5e96223e497538d06e18d8e84b774c4a35f654b4 (partial) and commit # c554cfce37e37a33f94a9051afe2062c4759072b Patch1: sane-frontends-1.0.14-sane-backends-1.0.20.patch +# Describe correct option names in xcam man page. +# Upstream commit 7e079e377174826453a1041719fb347d69d3ba5f +Patch2: sane-frontends-1.0.14-xcam-man.patch License: GPLv2+ Group: Applications/System BuildRequires: gtk2-devel @@ -24,6 +27,7 @@ This packages includes the scanadf and xcam programs. %setup -q %patch0 -p1 -b .array-out-of-bounds %patch1 -p1 -b .sane-backends-1.0.20 +%patch2 -p1 -b .xcam-man %build %configure --with-gnu-ld --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} @@ -47,6 +51,7 @@ rm -f %{buildroot}%{_datadir}/sane/sane-style.rc %changelog * Mon Jul 08 2013 Nils Philippsen - add comments to patches +- describe correct option names in xcam man page * Thu Feb 14 2013 Fedora Release Engineering - 1.0.14-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild