rpms/sane-backends
5
0
Fork 0
Code Issues Pull Requests Releases Activity

work around udev regexes not matching as they should (#244444)

Browse Source
This commit is contained in:
Nils Philippsen 2007-07-24 16:46:32 +00:00
parent e2ae888bfe
commit 3c425db50a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sane-backends-1.0.18-udev-new-kernels.patch
View File

@ -1,11 +1,14 @@
--- sane-backends-1.0.18/tools/sane-desc.c.udev-new-kernels 2007-07-22 23:22:21.000000000 +0200 --- sane-backends-1.0.18/tools/sane-desc.c.udev-new-kernels 2007-07-24 18:34:10.000000000 +0200
+++ sane-backends-1.0.18/tools/sane-desc.c 2007-07-22 23:23:51.000000000 +0200 +++ sane-backends-1.0.18/tools/sane-desc.c 2007-07-24 18:37:08.000000000 +0200
@@ -3173,7 +3173,7 @@ print_udev (void) @@ -3173,7 +3173,10 @@ print_udev (void)
print_udev_header (); print_udev_header ();
printf ("\nACTION!=\"add\", GOTO=\"libsane_rules_end\"\n"); printf ("\nACTION!=\"add\", GOTO=\"libsane_rules_end\"\n");
- printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libsane_rules_end\"\n\n"); - printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libsane_rules_end\"\n\n");
+ printf ("SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libsane_rules_end\"\n\n"); + printf ("SUBSYSTEM==\"usb\", GOTO=\"libsane_rules\"\n");
+ printf ("SUBSYSTEM==\"usb_device\", GOTO=\"libsane_rules\"\n\n");
+ printf ("GOTO=\"libsane_rules_end\"\n\n");
+ printf ("LABEL=\"libsane_rules\"\n\n");
while (usbid) while (usbid)
{ {
manufacturer_model_type * name = usbid->name; manufacturer_model_type * name = usbid->name;

7
sane-backends.spec
View File

@ -24,7 +24,7 @@
Summary: Scanner access software Summary: Scanner access software
Name: sane-backends Name: sane-backends
Version: 1.0.18 Version: 1.0.18
Release: 10%{?dist} Release: 11%{?dist}
License: GPL (programs), relaxed LGPL (libraries), and public domain (docs) License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
Group: System Environment/Libraries Group: System Environment/Libraries
Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@ -127,7 +127,7 @@ want to access digital cameras.
%patch8 -p1 -b .udev-new-kernels %patch8 -p1 -b .udev-new-kernels
%if %udev_098 %if %udev_098
%patch9 -p1 -b .udev-098 patch9 -p1 -b .udev-098
%endif %endif
for i in agfafocus avision coolscan2 umax_pp; do for i in agfafocus avision coolscan2 umax_pp; do
@ -248,6 +248,9 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/sane-backends.pc %{_libdir}/pkgconfig/sane-backends.pc
%changelog %changelog
* Tue Jul 24 2007 Nils Philippsen <nphilipp@redhat.com> - 1.0.18-11
- work around udev regexes not matching as they should (#244444)
* Sun Jul 22 2007 Nils Philippsen <nphilipp@redhat.com> - 1.0.18-10 * Sun Jul 22 2007 Nils Philippsen <nphilipp@redhat.com> - 1.0.18-10
- tweak udev rules generation (#244444) - tweak udev rules generation (#244444)