rpms/sane-backends/devel sane-backends-1.0.19-policykit.patch, 1.1, 1.2 sane-backends.spec, 1.101, 1.102

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

Modified Files:
	sane-backends-1.0.19-policykit.patch sane-backends.spec 
Log Message:
add HAL policy for SCSI scanners


sane-backends-1.0.19-policykit.patch:

Index: sane-backends-1.0.19-policykit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends-1.0.19-policykit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sane-backends-1.0.19-policykit.patch	7 Feb 2008 10:11:41 -0000	1.1
+++ sane-backends-1.0.19-policykit.patch	13 Feb 2008 09:20:14 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up sane-backends-20080206/tools/sane-desc.c.policykit sane-backends-20080206/tools/sane-desc.c
---- sane-backends-20080206/tools/sane-desc.c.policykit	2007-07-29 20:39:54.000000000 +0200
-+++ sane-backends-20080206/tools/sane-desc.c	2008-02-07 10:41:07.000000000 +0100
+diff -up sane-backends-1.0.19/tools/sane-desc.c.policykit sane-backends-1.0.19/tools/sane-desc.c
+--- sane-backends-1.0.19/tools/sane-desc.c.policykit	2007-07-29 20:39:54.000000000 +0200
++++ sane-backends-1.0.19/tools/sane-desc.c	2008-02-13 10:18:23.000000000 +0100
 @@ -3226,7 +3226,7 @@ print_udev (void)
  	    }
  	}
@@ -10,16 +10,27 @@
  	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2);
        usbid = usbid->next;
      }
-@@ -3279,7 +3279,7 @@ print_hal (void)
+@@ -3278,8 +3278,17 @@ print_hal (void)
+   usbid_type *usbid = create_usbids_table ();
    printf ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
    printf ("<deviceinfo version=\"0.2\">\n");
-   printf ("  <device>\n");
+-  printf ("  <device>\n");
 -  printf ("    <match key=\"info.bus\" string=\"usb\">\n");
++  printf ("  <device>\n\n");
++  printf ("    <!-- SCSI scanners -->\n");
++  printf ("    <match key=\"@info.parent:scsi.type\" string=\"scanner\">\n");
++  printf ("      <match key=\"info.category\" string=\"scsi_generic\">\n");
++  printf ("        <append key=\"info.capabilities\" type=\"strlist\">access_control</append>\n");
++  printf ("        <merge key=\"access_control.file\" type=\"copy_property\">linux.device_file</merge>\n");
++  printf ("        <merge key=\"access_control.type\" type=\"string\">scanner</merge>\n");
++  printf ("      </match>\n");
++  printf ("    </match>\n\n");
++  printf ("    <!-- USB scanners -->\n");
 +  printf ("    <match key=\"info.bus\" string=\"usb_device\">\n");
    while (usbid)
      {
        manufacturer_model_type * name = usbid->name;
-@@ -3295,10 +3295,12 @@ print_hal (void)
+@@ -3295,10 +3304,12 @@ print_hal (void)
  	  i++;
  	}
        printf (" -->\n");


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sane-backends.spec	12 Feb 2008 13:56:40 -0000	1.101
+++ sane-backends.spec	13 Feb 2008 09:20:14 -0000	1.102
@@ -22,7 +22,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.19
-Release: 2%{?dist}
+Release: 3%{?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
@@ -235,6 +235,9 @@
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Wed Feb 13 2008 Nils Philippsen <nphilipp at redhat.com> - 1.0.19-3
+- add HAL policy for SCSI scanners
+
 * Tue Feb 12 2008 Nils Philippsen <nphilipp at redhat.com> - 1.0.19-2
 - add files missing from CVS to make autoconf work