From 167367600b2ad1a302153a5f559189fb7092c270bdc16f0a9bf045fd92a909d1 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Tue, 16 Feb 2021 09:24:05 +0000 Subject: [PATCH] Accepting request 872527 from home:StefanBruens:branches:graphics - Remove udev rules mangling for USB devices (ATTR vs ATTRS) (!510) - Do no add SCSI id twice for EPSON Perfection 1640SU (!509) OBS-URL: https://build.opensuse.org/request/show/872527 OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=104 --- sane-backends.changes | 6 ++++++ sane-backends.spec | 10 ---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/sane-backends.changes b/sane-backends.changes index 7f6e6f0..1bbd4d8 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 15 13:57:16 UTC 2021 - Stefan Brüns + +- Remove udev rules mangling for USB devices (ATTR vs ATTRS) (!510) +- Do no add SCSI id twice for EPSON Perfection 1640SU (!509) + ------------------------------------------------------------------- Mon Feb 15 14:05:32 CET 2021 - jsmeix@suse.de diff --git a/sane-backends.spec b/sane-backends.spec index 61bb1e3..f9e66bf 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -361,13 +361,6 @@ install -m644 autoconfig.rules %{buildroot}%{_udevrulesdir}/56-sane-backends-aut # to place a paper on the scanner) so that both kind of devices # should usually require the same kind of security. sed -i -e 's/GROUP="scanner"/GROUP="lp"/' tools/udev/libsane.rules -# Regarding ATTRS{} (formerly SYSFS{}) versus ATTR{} see the Novell/Suse Bugzilla bug -# https://bugzilla.novell.com/show_bug.cgi?id=436085#c0 -# but for SCSI scanners "ATTRS" is mandatory see the Novell/Suse Bugzilla bug -# https://bugzilla.novell.com/show_bug.cgi?id=681146#c20 -# so that "ATTRS" is replaced by "ATTR" only for USB scanners. -# Upstream: https://gitlab.com/sane-project/backends/-/issues/341 -sed -i -e '/^LABEL="libsane_usb_rules_begin"/,/^LABEL="libsane_usb_rules_end"/s/ATTRS/ATTR/g' tools/udev/libsane.rules # Disable entries for USB scanners which are "unsupported" # but keep the entries for models for which the support status # is "complete", "good", "basic", "minimal", "untested" @@ -399,9 +392,6 @@ do if grep -q "^ATTR.idVendor.==$m" tools/udev/libsane.rules sed -i -e "/^ATTR.idVendor.==$m/Is/^ATTR/# ATTR/" tools/udev/libsane.rules fi done -# Add an entry for "SCSI processor EPSON Perfection1640", -# see https://bugzilla.novell.com/show_bug.cgi?id=681146#c43 -sed -i -e '/^# Epson Perfection 636S /i# Epson Perfection 1640\nKERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="EPSON", ATTRS{model}=="Perfection1640", MODE="0664", GROUP="lp", ENV{libsane_matched}="yes"' tools/udev/libsane.rules # Install the udev rules file: install -m644 tools/udev/libsane.rules %{buildroot}%{_udevrulesdir}/55-libsane.rules # Service files: