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-mg5300.patch b/sane-backends-mg5300.patch deleted file mode 100644 index 1420c55..0000000 --- a/sane-backends-mg5300.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up sane-backends-1.0.27/backend/pixma_mp150.c.mg5300 sane-backends-1.0.27/backend/pixma_mp150.c ---- sane-backends-1.0.27/backend/pixma_mp150.c.mg5300 2017-10-20 17:39:18.535552297 +0200 -+++ sane-backends-1.0.27/backend/pixma_mp150.c 2017-10-20 17:44:48.517691957 +0200 -@@ -168,6 +168,7 @@ - #define MX420_PID 0x174f - #define MX880_PID 0x1750 - -+/* Generation 5 */ - /* 2011 new devices (untested) */ - #define MG2100_PID 0x1751 - #define MG3100_PID 0x1752 -@@ -1354,7 +1355,7 @@ mp150_check_param (pixma_t * s, pixma_sc - { - uint8_t k = 1; - -- /* ADF/ADF duplex mode: max scan res is 600 dpi, at least for generation 4 */ -+ /* ADF/ADF duplex mode: max scan res is 600 dpi, at least for generation 4+ */ - if (mp->generation >= 4) - k = sp->xdpi / MIN (sp->xdpi, 600); - sp->x /= k; -@@ -1381,7 +1382,7 @@ mp150_scan (pixma_t * s) - if (mp->state != state_idle) - return PIXMA_EBUSY; - -- /* Generation 4: send XML dialog */ -+ /* Generation 4+: send XML dialog */ - /* adf: first page or idle */ - if (mp->generation == 4 && mp->adf_state == state_idle) - { -@@ -1423,7 +1424,7 @@ mp150_scan (pixma_t * s) - if (error < 0) - return error; - -- /* Generation 4: send XML dialog */ -+ /* Generation 4+: send XML dialog */ - /* adf: first page or idle */ - if (mp->generation == 4 && mp->adf_state == state_idle) - { -@@ -1647,8 +1648,8 @@ mp150_finish_scan (pixma_t * s) - if (error < 0) - PDBG (pixma_dbg (1, "WARNING:abort_session() failed %d\n", error)); - -- /* Generation 4: send XML end of scan dialog */ -- if (mp->generation == 4) -+ /* Generation 4+: send XML end of scan dialog */ -+ if (mp->generation >= 4) - { - if (!send_xml_dialog (s, XML_END)) - PDBG (pixma_dbg (1, "WARNING:XML_END dialog failed \n")); diff --git a/sane-backends-saned-manpage.patch b/sane-backends-saned-manpage.patch new file mode 100644 index 0000000..1418b68 --- /dev/null +++ b/sane-backends-saned-manpage.patch @@ -0,0 +1,28 @@ +diff -up sane-backends-1.0.27/doc/saned.man.saned-manpage sane-backends-1.0.27/doc/saned.man +--- sane-backends-1.0.27/doc/saned.man.saned-manpage 2017-11-27 12:42:05.077326419 +0100 ++++ sane-backends-1.0.27/doc/saned.man 2017-11-27 12:43:21.169769553 +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 configuration files in + .I /etc/systemd/system. diff --git a/sane-backends.spec b/sane-backends.spec index 22e14f5..a103b2c 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -33,7 +33,7 @@ Summary: Scanner access software Name: sane-backends Version: 1.0.27 -Release: 6%{?dist} +Release: 7%{?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 @@ -51,8 +52,8 @@ Patch0: sane-backends-1.0.25-udev.patch Patch1: sane-backends-1.0.23-soname.patch # Fedora-specific (for now): make installed sane-config multi-lib aware again Patch2: sane-backends-1.0.23-sane-config-multilib.patch -# Backported upstream patch - rhbz#1504412 -Patch3: sane-backends-mg5300.patch +# saned manpage incomplete and exists when saned is not installed (#1515762) +Patch3: sane-backends-saned-manpage.patch URL: http://www.sane-project.org @@ -180,7 +181,7 @@ access image acquisition devices available on the local host. %patch0 -p1 -b .udev %patch1 -p1 -b .soname %patch2 -p1 -b .sane-config-multilib -%patch3 -p1 -b .mg5300 +%patch3 -p1 -b .saned-manpage %build CFLAGS="%optflags -fno-strict-aliasing" @@ -247,6 +248,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 @@ -300,6 +303,7 @@ exit 0 %{_bindir}/umax_pp %exclude %{_mandir}/man1/sane-config.1* +%exclude %{_mandir}/man8/saned* %{_mandir}/*/* %dir %{_libdir}/sane @@ -327,10 +331,15 @@ exit 0 %files daemon %{_sbindir}/saned +%{_mandir}/man8/saned* %{_unitdir}/saned.socket %{_unitdir}/saned@.service %changelog +* Wed Nov 22 2017 Zdenek Dohnal - 1.0.27-7 +- 1515762 - saned manpage incomplete and exists when saned is not installed +- removing 1504412 + * Fri Oct 20 2017 Zdenek Dohnal - 1.0.27-6 - 1504412 - Scanning using a Canon PiXMA multi-function scanner extremely unreliable