rpms/pilot-link/F-8 19-pam-acl-management.fdi, 1.1, 1.2 pilot-link.spec, 1.65, 1.66

Ivana Varekova (varekova) fedora-extras-commits at redhat.com
Thu Nov 29 14:43:15 UTC 2007


Author: varekova

Update of /cvs/pkgs/rpms/pilot-link/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13561

Modified Files:
	19-pam-acl-management.fdi pilot-link.spec 
Log Message:
fdi file change



Index: 19-pam-acl-management.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/F-8/19-pam-acl-management.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 19-pam-acl-management.fdi	29 Nov 2007 14:22:27 -0000	1.1
+++ 19-pam-acl-management.fdi	29 Nov 2007 14:42:42 -0000	1.2
@@ -3,16 +3,6 @@
 <deviceinfo version="0.2">
 
   <device>
-    <match key="info.capabilities" contains="serial">
-      <!-- Pocket PC PDAs -->
-      <match key="info.linux.driver" string="ipaq">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.type" type="string">pda</merge>
-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-
-      <!-- PDAs via Linux 'visor' kernel driver -->
-      <match key="info.linux.driver" string="visor">
 
 	<!--
 	    on Sony Clie 3.5 devices we need to mark port 0 instead of port 1. For
@@ -24,59 +14,55 @@
 	    be used is written to syslog, perhaps we can somehow get that information
 	    from the driver directly?)
 	-->
-	<match key="usb.vendor_id" int="0x054c">
-  	  <!-- Sony Clie 3.5 -->
-          <match key="usb.product_id" int="0x0038">
-            <append key="info.capabilities" type="strlist">access_control</append>
-	    <merge key="access_control.type" type="string">pda</merge>
-            <merge key="access_control.file" type="copy_property">linux.device_file</merge>                            
-          </match>
-  	  <!-- Sony Clie SJ-22 -->
-          <match key="usb.product_id" int="0x0066">
-              <append key="info.capabilities" type="strlist">access_control</append>
-              <merge key="access_control.type" type="string">pda</merge>
-              <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-            </match>
-          </match>
-	</match>
-
-        <!-- Handspring -->
-	<match key="usb.vendor_id" int="0x082d">
-  	  <!-- Visor -->
-          <match key="usb.product_id" int="0x0100">
-            <append key="info.capabilities" type="strlist">access_control</append>
-            <merge key="access_control.type" type="string">pda</merge>
-            <merge key="access_control.file" type="copy_property">linux.device_file</merge>                  
-          </match>
-	</match>
-
-	<!-- Known Palm PDAs from Palm, Inc. -->
-	<match key="usb.vendor_id" int="0x0830">
-  	  <!-- Palm m130 -->
-          <match key="usb.product_id" int="0x0050">
-            <append key="info.capabilities" type="strlist">access_control</append>
-            <merge key="access_control.type" type="string">pda</merge>
-            <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-            <match key="serial.port" int="0">  
-          </match>
-  	  <!-- Tungsten T5 -->
-          <match key="usb.product_id" int="0x0061">
-            <append key="info.capabilities" type="strlist">access_control</append>
-            <merge key="access_control.type" type="string">pda</merge>
-            <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
-          </match>
-	</match>
-
-  	<!-- All the other PalmOS PDAs as fallback -->
-	<match key="pda.platform" exists="false">
+   <match key="usb.vendor_id" int="0x054c">
+      <!-- Sony Clie 3.5 -->
+      <match key="usb.product_id" int="0x0038">
+         <append key="info.capabilities" type="strlist">access_control</append>
+         <merge key="access_control.type" type="string">pda</merge>
+         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                            
+      </match>
+      <!-- Sony Clie SJ-22 -->
+      <match key="usb.product_id" int="0x0066">
           <append key="info.capabilities" type="strlist">access_control</append>
           <merge key="access_control.type" type="string">pda</merge>
           <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-                                        
-	</match>
+      </match>
+   </match>
 
+   <!-- Handspring -->
+   <match key="usb.vendor_id" int="0x082d">
+      <!-- Visor -->
+      <match key="usb.product_id" int="0x0100">
+         <append key="info.capabilities" type="strlist">access_control</append>
+         <merge key="access_control.type" type="string">pda</merge>
+         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                  
       </match>
-    </match>
+   </match>
+
+   <!-- Known Palm PDAs from Palm, Inc. -->
+   <match key="usb.vendor_id" int="0x0830">
+      <!-- Palm m130 -->
+      <match key="usb.product_id" int="0x0050">
+        <append key="info.capabilities" type="strlist">access_control</append>
+        <merge key="access_control.type" type="string">pda</merge>
+        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
+      </match>
+      <!-- Tungsten T5 -->
+      <match key="usb.product_id" int="0x0061">
+         <append key="info.capabilities" type="strlist">access_control</append>
+         <merge key="access_control.type" type="string">pda</merge>
+         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
+      </match>
+   </match>
+
+   <!-- All the other PalmOS PDAs as fallback -->
+   <match key="pda.platform" exists="false">
+      <append key="info.capabilities" type="strlist">access_control</append>
+      <merge key="access_control.type" type="string">pda</merge>
+      <merge key="access_control.file" type="copy_property">linux.device_file</merge>
+                                    
+   </match>
+
 
     <match key="info.subsystem" string="usb_device">
       <match key="info.product" contains="Palm Handheld">


Index: pilot-link.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/F-8/pilot-link.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- pilot-link.spec	29 Nov 2007 14:22:27 -0000	1.65
+++ pilot-link.spec	29 Nov 2007 14:42:42 -0000	1.66
@@ -177,7 +177,7 @@
 
 %changelog
 * Tue Nov 27 2007 Ivana Varekova <varekova at redhat.com> - 2:0.12.2-9
-- Install hal and PoliceKit rules for visor module (#280251)
+- Install hal and PoliceKit rules (#280251)
   put visor to blacklist 
   patch by Harald Hoyer - thanks, thanks Alex Lancaster
  




More information about the fedora-extras-commits mailing list