From 11bcac3fa9fcfd952420b7377462b2451cd412a25cfe1f820d1707b798b3e8dc Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 4 Dec 2008 01:36:13 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=26 --- sane-backends.changes | 5 +++++ sane-backends.spec | 33 +++++++++++++++++++++------------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/sane-backends.changes b/sane-backends.changes index 4b3211d..dcf87c2 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 3 17:11:53 CET 2008 - lnussel@suse.de + +- use "usb" instead of "usb_device" (bnc#438867) + ------------------------------------------------------------------- Wed Dec 3 11:10:31 CET 2008 - jsmeix@suse.de diff --git a/sane-backends.spec b/sane-backends.spec index 833b877..18c0204 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -25,7 +25,7 @@ Group: Hardware/Scanner AutoReqProv: on Summary: SANE (Scanner Access Now Easy) Scanner Drivers Version: 1.0.19 -Release: 97 +Release: 98 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 @@ -492,14 +492,6 @@ install -m644 tools/udev/libsane.rules %{buildroot}%{_sysconfdir}/udev/rules.d/5 # Modify the generated tools/hal/libsane.fdi file as follows: # Add a generic entry for SCSI scanners: sed -i -e '//a\n \n scanner<\/append>\n <\/match>\n<\/match>' tools/hal/libsane.fdi -# Replace 'key="info.bus" string="usb"' by 'key="info.subsystem" string="usb_device"', -# and replace 'key="usb.vendor_id"' by 'key="usb_device.vendor_id"', -# and replace 'key="usb.product_id"' by 'key="usb_device.product_id"', -# see the Novell/Suse Bugzilla bug -# https://bugzilla.novell.com/show_bug.cgi?id=250659 -sed -i -e 's/key="info.bus" string="usb"/key="info.subsystem" string="usb_device"/' tools/hal/libsane.fdi -sed -i -e 's/key="usb.vendor_id"/key="usb_device.vendor_id"/' tools/hal/libsane.fdi -sed -i -e 's/key="usb.product_id"/key="usb_device.product_id"/' tools/hal/libsane.fdi # Remove 'key="scanner.access_method"' lines. sed -i -e '/key="scanner.access_method"/d' tools/hal/libsane.fdi # There is a small number of USB scanners which are not talked to via libusb. @@ -514,9 +506,9 @@ sed -i -e '/key="scanner.access_method"/d' tools/hal/libsane.fdi # it must not add to 80-scanner.fdi (i.e. the explicitely marked as "SCSIviaUSBscanner" models). # Currently there are no hexadecimal numbers in libsane.fdi with uppercase letters # nevertheless to be safe the GNU sed extension to ignore case for pattern matching is used: -sed -i -e '/usb_device.vendor_id.*0x04ce/I,/append key/{/usb_device.product_id.*0x0300/I,/append key/s/scanner/SCSIviaUSBscanner/g}' tools/hal/libsane.fdi +sed -i -e '/usb.vendor_id.*0x04ce/I,/append key/{/usb.product_id.*0x0300/I,/append key/s/scanner/SCSIviaUSBscanner/g}' tools/hal/libsane.fdi for ID in 0094 0099 009a 00a0 00a3 80a3 80ac 00b6 -do sed -i -e "/usb_device.vendor_id.*0x05da/I,/append key/{/usb_device.product_id.*0x$ID/I,/append key/s/scanner/SCSIviaUSBscanner/g}" tools/hal/libsane.fdi +do sed -i -e "/usb.vendor_id.*0x05da/I,/append key/{/usb.product_id.*0x$ID/I,/append key/s/scanner/SCSIviaUSBscanner/g}" tools/hal/libsane.fdi done # Disable entries for USB scanners which are "unsupported" # but keep the entries for models for which the support status @@ -536,8 +528,23 @@ done for ID in $( cat unsupportedUSBIDs ) do V="$( echo $ID | cut -d : -s -f 1 )" P="$( echo $ID | cut -d : -s -f 2 )" - sed -i -e "/usb_device.vendor_id.*$V/I,/info.capabilities/{/usb_device.product_id.*$P/I,/info.capabilities/{s//append> -->/}}" tools/hal/libsane.fdi + sed -i -e "/usb.vendor_id.*$V/I,/info.capabilities/{/usb.product_id.*$P/I,/info.capabilities/{s//append> -->/}}" tools/hal/libsane.fdi done +%if 0%{?suse_version} < 1110 +# for hal-resmgr +# Replace 'key="info.bus" string="usb"' by 'key="info.subsystem" string="usb_device"', +# and replace 'key="usb.vendor_id"' by 'key="usb_device.vendor_id"', +# and replace 'key="usb.product_id"' by 'key="usb_device.product_id"', +# see the Novell/Suse Bugzilla bug +# https://bugzilla.novell.com/show_bug.cgi?id=250659 +sed -i -e 's/key="info.bus" string="usb"/key="info.subsystem" string="usb_device"/' tools/hal/libsane.fdi +sed -i -e 's/key="usb.vendor_id"/key="usb_device.vendor_id"/' tools/hal/libsane.fdi +sed -i -e 's/key="usb.product_id"/key="usb_device.product_id"/' tools/hal/libsane.fdi +%else +# for hal-acl-tool +# https://bugzilla.novell.com/show_bug.cgi?id=438867 +sed -i -e 's/key="info.bus" string="usb"/key="info.subsystem" string="usb"/' tools/hal/libsane.fdi +%endif # Install the HAL fdi file: install -d %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty install -m644 tools/hal/libsane.fdi %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty/70-scanner.fdi @@ -598,6 +605,8 @@ exit 0 %{_sysconfdir}/udev/rules.d/56-sane-backends-autoconfig.rules %changelog +* Wed Dec 03 2008 lnussel@suse.de +- use "usb" instead of "usb_device" (bnc#438867) * Wed Dec 03 2008 jsmeix@suse.de - Moved /etc/hal/fdi/policy/10osvendor/70-scanner.fdi to /usr/share/hal/fdi/information/20thirdparty/70-scanner.fdi