diff --git a/sane-backends.changes b/sane-backends.changes index 6c7a3bf..4abc27a 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 18 00:04:42 UTC 2009 - seife@opensuse.org + +- fix udev warnings 'NAME="%k" is superfluous' + ------------------------------------------------------------------- Tue Nov 3 19:09:44 UTC 2009 - coolo@novell.com diff --git a/sane-backends.spec b/sane-backends.spec index 3249271..c4eb876 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,7 +1,7 @@ # # spec file for package sane-backends (Version 1.0.20) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,12 @@ Name: sane-backends BuildRequires: libgphoto2-devel libieee1284 libjpeg-devel net-snmp-devel pkg-config texlive-latex -License: GPL v2 only ; GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware +License: GPLv2 ; GPLv2+ ; LGPLv2.1+ ; Public Domain, Freeware Group: Hardware/Scanner AutoReqProv: on Summary: SANE (Scanner Access Now Easy) Scanner Drivers Version: 1.0.20 -Release: 8 +Release: 9 Url: http://www.sane-project.org/ # URL for Source0: http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz Source0: sane-backends-%{version}.tar.bz2 @@ -257,7 +257,7 @@ Authors: Wittawat Yamwong %package autoconfig -License: GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware +License: GPLv2+ ; LGPLv2.1+ ; Public Domain, Freeware Group: Hardware/Scanner Summary: USB Scanner Autoconfiguration Requires: sane-backends @@ -544,6 +544,8 @@ done for m in $( sed -e 's/0x/./ig' -e 's/:/.,.ATTR.idProduct.==/' unsupportedUSBIDs ) do sed -i -e "/^ATTR.idVendor.==$m/Is/^ATTR/# ATTR/" tools/udev/libsane.rules done +# newer udev versions complain about NAME="%k" usage, saying it's superfluous +sed -i -e 's/NAME="%k", //' tools/udev/libsane.rules # Install the udev rules file: install -m644 tools/udev/libsane.rules %{buildroot}%{_sysconfdir}/udev/rules.d/55-libsane.rules # Regarding HAL: