diff --git a/.gitignore b/.gitignore index 3c8582d..bfb840c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ sane-backends-1.0.21.tar.gz /sane-backends-1.0.29.tar.gz /sane-backends-1.0.30.tar.gz /sane-backends-1.0.31.tar.gz +/sane-backends-1.0.32.tar.gz diff --git a/sane-backends-saned-manpage.patch b/sane-backends-saned-manpage.patch deleted file mode 100644 index 3b2111f..0000000 --- a/sane-backends-saned-manpage.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up sane-backends-1.0.28/doc/saned.man.saned-manpage sane-backends-1.0.28/doc/saned.man ---- sane-backends-1.0.28/doc/saned.man.saned-manpage 2019-09-12 10:28:11.572506087 +0200 -+++ sane-backends-1.0.28/doc/saned.man 2019-09-12 10:35:49.445861686 +0200 -@@ -257,8 +257,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 b33de95..bf6aef6 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -13,14 +13,14 @@ Summary: Scanner access software Name: sane-backends -Version: 1.0.31 -Release: 5%{?dist} +Version: 1.0.32 +Release: 1%{?dist} # lib/ is LGPLv2+, backends are GPLv2+ with exceptions # Tools are GPLv2+, docs are public domain # see LICENSE for details License: GPLv2+ and GPLv2+ with exceptions and Public Domain and IJG and LGPLv2+ and MIT # GitLab Download URLs are amazing. But the source code link has different name and doesnt have generated autotools stuff -Source0: https://gitlab.com/sane-project/backends/uploads/8bf1cae2e1803aefab9e5331550e5d5d/%{name}-%{version}.tar.gz +Source0: https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/%{name}-%{version}.tar.gz Source1: sane.png Source2: saned.socket @@ -35,11 +35,6 @@ 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 -# saned manpage incomplete and exists when saned is not installed (#1515762) -Patch3: sane-backends-saned-manpage.patch -# 1750899 - CANOSCAN N650U scanner device not correctly detected via USB -# reported as https://gitlab.com/sane-project/backends/-/merge_requests/535 -Patch4: sane-plustek-add-1ms.patch URL: http://www.sane-project.org @@ -159,8 +154,6 @@ 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 .saned-manpage -%patch4 -p1 -b .sane-plustek-add-1ms %build CFLAGS="%optflags -fno-strict-aliasing" @@ -305,7 +298,7 @@ exit 0 %files libs %{_libdir}/libsane.so.1 -%{_libdir}/libsane.so.1.0.31 +%{_libdir}/libsane.so.1.0.32 %files devel %{_bindir}/sane-config @@ -417,14 +410,14 @@ exit 0 %{_libdir}/sane/libsane-v4l.so %{_libdir}/sane/libsane-xerox_mfp.so %{_libdir}/sane/*.so.1 -%{_libdir}/sane/*.so.1.0.31 +%{_libdir}/sane/*.so.1.0.32 %exclude %{_libdir}/sane/*gphoto2.so* %files drivers-cameras %{_libdir}/sane/libsane-gphoto2.so %{_libdir}/sane/libsane-gphoto2.so.1 -%{_libdir}/sane/libsane-gphoto2.so.1.0.31 +%{_libdir}/sane/libsane-gphoto2.so.1.0.32 %files daemon %{_sbindir}/saned @@ -434,6 +427,9 @@ exit 0 %{_unitdir}/saned@.service %changelog +* Tue Feb 16 2021 Zdenek Dohnal - 1.0.32-1 +- 1928484 - sane-backends-1.0.32 is available + * Wed Jan 27 2021 Fedora Release Engineering - 1.0.31-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sane-plustek-add-1ms.patch b/sane-plustek-add-1ms.patch deleted file mode 100644 index f8068fc..0000000 --- a/sane-plustek-add-1ms.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/backend/plustek-usbhw.c b/backend/plustek-usbhw.c -index 05d3cc7..28cbd52 100644 ---- a/backend/plustek-usbhw.c -+++ b/backend/plustek-usbhw.c -@@ -1451,6 +1451,14 @@ usb_ResetRegisters( Plustek_Device *dev ) - * CanoScan devices to work properly after power-up - */ - sanei_lm983x_write_byte( dev->fd, 0x5b, regs[0x5b] ); -+ -+ /* At least CanoScan N650U can have a problem with writing -+ * to register 0x59 due XHCI USB controller is too -+ * fast for him. Simulate EHCI USB controller's -+ * behavior here - wait 1ms. -+ */ -+ usleep(1000); -+ - sanei_lm983x_write_byte( dev->fd, 0x59, regs[0x59] ); - sanei_lm983x_write_byte( dev->fd, 0x5a, regs[0x5a] ); - } else { diff --git a/sources b/sources index b92f7d4..87e129c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sane-backends-1.0.31.tar.gz) = 5d49ca698af38a30a3d23349f2fe82a4a21262b014ca38407d5ea0b3fe7cec72860a39c8651c8a5e2f561a9a740008658a36ed6bd96324be84646dbcf1461bfb +SHA512 (sane-backends-1.0.32.tar.gz) = 416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5