rpms/sane-backends/devel sane-backends-1.0.18-udev-new-kernels.patch, 1.3, 1.4 sane-backends.spec, 1.84, 1.85

Nils Philippsen (nphilipp) fedora-extras-commits at redhat.com
Tue Jul 24 16:46:35 UTC 2007


Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6812

Modified Files:
	sane-backends-1.0.18-udev-new-kernels.patch sane-backends.spec 
Log Message:
work around udev regexes not matching as they should (#244444)


sane-backends-1.0.18-udev-new-kernels.patch:

Index: sane-backends-1.0.18-udev-new-kernels.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends-1.0.18-udev-new-kernels.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sane-backends-1.0.18-udev-new-kernels.patch	22 Jul 2007 21:26:51 -0000	1.3
+++ sane-backends-1.0.18-udev-new-kernels.patch	24 Jul 2007 16:46:32 -0000	1.4
@@ -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	2007-07-22 23:23:51.000000000 +0200
-@@ -3173,7 +3173,7 @@ print_udev (void)
+--- 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-24 18:37:08.000000000 +0200
+@@ -3173,7 +3173,10 @@ print_udev (void)
  
    print_udev_header ();
    printf ("\nACTION!=\"add\", GOTO=\"libsane_rules_end\"\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)
      {
        manufacturer_model_type * name = usbid->name;


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sane-backends.spec	22 Jul 2007 21:26:51 -0000	1.84
+++ sane-backends.spec	24 Jul 2007 16:46:32 -0000	1.85
@@ -24,7 +24,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.18
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -127,7 +127,7 @@
 %patch8 -p1 -b .udev-new-kernels
 
 %if %udev_098
-%patch9 -p1 -b .udev-098
+patch9 -p1 -b .udev-098
 %endif
 
 for i in agfafocus avision coolscan2 umax_pp; do
@@ -248,6 +248,9 @@
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Tue Jul 24 2007 Nils Philippsen <nphilipp at redhat.com> - 1.0.18-11
+- work around udev regexes not matching as they should (#244444)
+
 * Sun Jul 22 2007 Nils Philippsen <nphilipp at redhat.com> - 1.0.18-10
 - tweak udev rules generation (#244444)
 




More information about the scm-commits mailing list