From 87b7d51099e8ac48751290020aa173c34678976a Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Nov 23 2017 10:05:04 +0000
Subject: 1515762 - saned manpage incomplete and exists when saned is not installed


---

diff --git a/README.Fedora b/README.Fedora
new file mode 100644
index 0000000..82b0909
--- /dev/null
+++ b/README.Fedora
@@ -0,0 +1,12 @@
+README.Fedora
+-------------
+
+This file is meant as README for Fedora specific changes for sane-backends
+package.
+
+SANE daemon is moved to subpackage
+----------------------------------
+sane-backends daemon - saned - its manual page and systemd unit files are moved
+into subpackage named sane-backends-daemon. It was done because daemon provides
+access to scanning devices on remote server, which nowadays isn't common 
+usage of sane-backends, so it wasn't necessary to ship it with main package.
diff --git a/sane-backends-saned-manpage.patch b/sane-backends-saned-manpage.patch
new file mode 100644
index 0000000..725525e
--- /dev/null
+++ b/sane-backends-saned-manpage.patch
@@ -0,0 +1,28 @@
+diff -up sane-backends-1.0.25/doc/saned.man.saned-manpage sane-backends-1.0.25/doc/saned.man
+--- sane-backends-1.0.25/doc/saned.man.saned-manpage	2017-11-22 14:27:50.271449819 +0100
++++ sane-backends-1.0.25/doc/saned.man	2017-11-22 14:34:48.131587714 +0100
+@@ -223,8 +223,22 @@ installed on the system. this is the pre
+ Saned can be used wih systemd without the systemd integration 
+ compiled in, but then logging of debug information is not supported. 
+ 
+-The systemd configuration is different for the 2 options, so
+-both are described below.
++The systemd configuration is different for the 2 options, but you need
++to create unit files in both options and then run as root:
++.PP
++.RS
++systemctl start saned.socket
++.RE
++.PP
++to start saned. If you want to have saned.socket running after startup, run as
++root: 
++.PP
++.RS
++systemctl enable saned.socket
++.RE
++.PP
++
++The systemd configuration of both options is described below.
+ .SH Systemd configuration for saned with systemd support compiled in
+ for the systemd configuration we need to add 2 configuation files in 
+ .I /etc/systemd/system.
diff --git a/sane-backends.spec b/sane-backends.spec
index ca022b4..7ce55a2 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -33,7 +33,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.25
-Release: 7%{?dist}
+Release: 8%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -43,6 +43,7 @@ Source0: https://alioth.debian.org/frs/download.php/latestfile/176/sane-backends
 Source1: sane.png
 Source2: saned.socket
 Source3: saned@.service.in
+Source4: README.Fedora
 
 # Fedora-specific, probably not generally applicable:
 Patch0: sane-backends-1.0.25-udev.patch
@@ -55,6 +56,8 @@ Patch2: sane-backends-1.0.23-sane-config-multilib.patch
 Patch3: sane-backends-1.0.25-avision-skip-adf.patch
 # CVE-2017-6318 - backported from upstream 42896939822b44f44ecd1b6d35afdfa4473ed35d
 Patch4: sane-backends-1.0.25-CVE-2017-6318.patch
+# saned manpage incomplete and exists when saned is not installed (#1515762)
+Patch5: sane-backends-saned-manpage.patch
 
 URL: http://www.sane-project.org
 
@@ -183,6 +186,7 @@ access image acquisition devices available on the local host.
 %patch2 -p1 -b .sane-config-multilib
 %patch3 -p1 -b .avision-skip-adf
 %patch4 -p1 -b .CVE-2017-6318
+%patch5 -p1 -b .saned-manpage
 
 %build
 CFLAGS="%optflags -fno-strict-aliasing"
@@ -249,6 +253,8 @@ for f in *; do
 done
 popd
 
+install -m 644 %{SOURCE4} %{buildroot}%{_maindocdir}
+
 install -m 755 -d %{buildroot}%{_unitdir}
 install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
 sed 's|@CONFIGDIR@|%{_sysconfdir}/sane.d|g' < %{SOURCE3} > saned@.service
@@ -302,6 +308,7 @@ exit 0
 %{_bindir}/umax_pp
 
 %exclude %{_mandir}/man1/sane-config.1*
+%exclude %{_mandir}/man8/saned*
 %{_mandir}/*/*
 
 %dir %{_libdir}/sane
@@ -329,10 +336,14 @@ exit 0
 
 %files daemon
 %{_sbindir}/saned
+%{_mandir}/man8/saned*
 %{_unitdir}/saned.socket
 %{_unitdir}/saned@.service
 
 %changelog
+* Wed Nov 22 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1.0.25-8
+- 1515762 - saned manpage incomplete and exists when saned is not installed
+
 * Wed Mar 22 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1.0.25-7
 - 1428886 - CVE-2017-6318 sane-backends: SANE_NET_CONTROL_OPTION response packet may contain memory contents of the server [fedora-all]