rpms/sane-backends/devel sane-backends-1.0.20-udev.patch, 1.1, 1.2 sane-backends.spec, 1.133, 1.134

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20492

Modified Files:
	sane-backends-1.0.20-udev.patch sane-backends.spec 
Log Message:
fix device file ownership and mode


sane-backends-1.0.20-udev.patch:
 sane-desc.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Index: sane-backends-1.0.20-udev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends-1.0.20-udev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sane-backends-1.0.20-udev.patch	22 Oct 2009 10:17:45 -0000	1.1
+++ sane-backends-1.0.20-udev.patch	22 Oct 2009 12:32:41 -0000	1.2
@@ -1,11 +1,17 @@
-commit 5e153e8354ee1cba5d7cd4a532f671810186a6a1
+commit 91cbd80ad6f86af2d5696caeab2be0c404c4663c
 Author: Nils Philippsen <nils at redhat.com>
-Date:   Thu Oct 22 11:19:22 2009 +0200
+Date:   Thu Oct 22 14:29:41 2009 +0200
 
     patch: udev
     
     Squashed commit of the following:
     
+    commit e385558cf214d263af93147995f1f8b729d2dabe
+    Author: Nils Philippsen <nils at redhat.com>
+    Date:   Thu Oct 22 14:19:53 2009 +0200
+    
+        fix device file ownership and mode
+    
     commit fe874d6f9873598e8bcd9201508bc2c89365e821
     Author: Nils Philippsen <nils at redhat.com>
     Date:   Thu Oct 22 11:16:16 2009 +0200
@@ -13,26 +19,50 @@ Date:   Thu Oct 22 11:19:22 2009 +0200
         adapt generated udev rules for Fedora
 
 diff --git a/tools/sane-desc.c b/tools/sane-desc.c
-index c317700..b6638a4 100644
+index c317700..07f3a2b 100644
 --- a/tools/sane-desc.c
 +++ b/tools/sane-desc.c
-@@ -3488,7 +3488,7 @@ print_udev (void)
+@@ -56,9 +56,9 @@
+ #define COLOR_NEW          "\"#F00000\""
+ #define COLOR_UNKNOWN      "\"#000000\""
+ 
+-#define DEVMODE  "0664"
++#define DEVMODE  "0644"
+ #define DEVOWNER "root"
+-#define DEVGROUP "scanner"
++#define DEVGROUP "root"
+ 
+ #ifndef PATH_MAX
+ # define PATH_MAX 1024
+@@ -3475,8 +3475,8 @@ print_udev (void)
+ 	    }
+ 	}
+       printf ("\n");
+-      printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
+-	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2, DEVMODE, DEVGROUP);
++      printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
++	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2, DEVMODE, DEVOWNER, DEVGROUP);
+       usbid = usbid->next;
+     }
+ 
+@@ -3488,7 +3488,8 @@ print_udev (void)
    printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
    printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
    printf ("# Generic: SCSI device type 6 indicates a scanner\n");
 -  printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
-+  printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", ENV{libsane_matched}=\"yes\"\n");
++  printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
++          DEVMODE, DEVOWNER, DEVGROUP);
    printf ("# Some scanners advertise themselves as SCSI device type 3\n");
  
    while (scsiid)
-@@ -3521,8 +3521,8 @@ print_udev (void)
+@@ -3521,8 +3522,8 @@ print_udev (void)
  	    }
          }
        printf ("\n");
 -      printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
 -	      scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP);
-+      printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
-+	      scsiid->scsi_vendor_id, scsiid->scsi_product_id);
++      printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
++	      scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVOWNER, DEVGROUP);
        scsiid = scsiid->next;
      }
    printf ("LABEL=\"libsane_scsi_rules_end\"\n\n");


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- sane-backends.spec	22 Oct 2009 10:17:45 -0000	1.133
+++ sane-backends.spec	22 Oct 2009 12:32:41 -0000	1.134
@@ -15,7 +15,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.20
-Release: 8%{?dist}
+Release: 9%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -189,6 +189,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Thu Oct 22 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-9
+- fix device file ownership and mode
+
 * Thu Oct 22 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-8
 - ship adapted udev rules from F-12 on (#512516)
 - don't require pam anymore