rpms/pilot-link/devel pilot-link-0.12.2-Zire.patch, NONE, 1.1 19-pam-acl-management.fdi, 1.1, 1.2 pilot-link.spec, 1.73, 1.74

Ivana Varekova (varekova) fedora-extras-commits at redhat.com
Mon Mar 3 10:13:31 UTC 2008


Author: varekova

Update of /cvs/pkgs/rpms/pilot-link/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2341

Modified Files:
	19-pam-acl-management.fdi pilot-link.spec 
Added Files:
	pilot-link-0.12.2-Zire.patch 
Log Message:
- Synchronize with F-8 branch:
- add Z22 patch
- change hal rules


pilot-link-0.12.2-Zire.patch:

--- NEW FILE pilot-link-0.12.2-Zire.patch ---
diff -up pilot-link-0.12.2/libpisock/usb.c.pom pilot-link-0.12.2/libpisock/usb.c
--- pilot-link-0.12.2/libpisock/usb.c.pom	2008-02-07 15:03:58.000000000 +0100
+++ pilot-link-0.12.2/libpisock/usb.c	2008-02-07 15:02:51.000000000 +0100
@@ -810,7 +810,8 @@ pi_usb_dev_t known_devices[] = {
 	{
 		.vendor 	= 0x0830,
 		.product 	= 0x0061,
+		.idstr 		= "Zire 31, 72, Z22",
+		.flags		= USB_INIT_TAPWAVE,
-		.idstr 		= "Zire 31, 72",
 	},
 
 	{


Index: 19-pam-acl-management.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/devel/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	4 Jan 2008 08:43:15 -0000	1.1
+++ 19-pam-acl-management.fdi	3 Mar 2008 10:12:41 -0000	1.2
@@ -4,54 +4,238 @@
 
   <device>
 
-   <match key="usb.vendor_id" int="0x054c">
-      <!-- Sony Clie 3.5 -->
-      <match key="usb.product_id" int="0x0038">
+   <!-- Sony -->
+   <match key="usb_device.vendor_id" int="0x054c">
+      <!-- Sony NR and other Palm OS 4.1 devices -->
+      <match key="usb_device.product_id" int="0x000a">
+         <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 S S320 and other Palm OS 3.5 devices -->
+      <match key="usb_device.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 T, SJ series, and other Palm OS 4.0 devices --> 
+      <match key="usb_device.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>
+      <!-- Sony S360 -->
+      <match key="usb_device.product_id" int="0x0095">
          <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">
+      <!-- Sony NR70V/U -->
+      <match key="usb_device.product_id" int="0x009a">
           <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 NX -->
+      <match key="usb_device.product_id" int="0x00da">
+         <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 NZ -->
+      <match key="usb_device.product_id" int="0x00e9">
+          <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 UX -->
+      <match key="usb_device.product_id" int="0x0144">
+         <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 TJ -->
+      <match key="usb_device.product_id" int="0x0169">
+          <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>
 
+
    <!-- Handspring -->
-   <match key="usb.vendor_id" int="0x082d">
-      <!-- Visor -->
-      <match key="usb.product_id" int="0x0100">
+   <match key="usb_device.vendor_id" int="0x082d">
+      <!-- Visor, Treo 300 -->
+      <match key="usb_device.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>
+      <!-- Treo -->
+      <match key="usb_device.product_id" int="0x0200">
+         <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>
+      <!-- Treo 600 -->
+      <match key="usb_device.product_id" int="0x0300">
          <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>
+
+
+   <!-- Palm, Inc. and palmOne -->
+   <match key="usb_device.vendor_id" int="0x0830">
+      <!-- m500 -->
+      <match key="usb_device.product_id" int="0x0001">
+        <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>
+      <!-- m505 -->
+      <match key="usb_device.product_id" int="0x0002">
+         <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>
+      <!-- m515 -->
+      <match key="usb_device.product_id" int="0x0003">
+        <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>
+      <!-- i705 -->
+      <match key="usb_device.product_id" int="0x0020">
+         <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|Z -->
+      <match key="usb_device.product_id" int="0x0030">
+         <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|W -->                                  
+      <match key="usb_device.product_id" int="0x0031">
+        <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>
+      <!-- m125 -->
+      <match key="usb_device.product_id" int="0x0040">
+         <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>
+      <!-- m130 -->
+      <match key="usb_device.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 series, Zire 71 -->
+      <match key="usb_device.product_id" int="0x0060">
+         <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>
+      <!-- Zire 31, 72, Z22 -->
+      <match key="usb_device.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>
+      <!-- Zire -->
+      <match key="usb_device.product_id" int="0x0070">
+        <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>
+      <!-- m100 -->
+      <match key="usb_device.product_id" int="0x0080">
+         <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">
+
+   <!-- Samsung -->
+   <match key="usb_device.vendor_id" int="0x04e8">
+
+      <match key="usb_device.product_id" int="0x6601">
         <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">
+      <!-- i330 -->
+      <match key="usb_device.product_id" int="0x8001">
          <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 key="info.subsystem" string="usb_device">
-      <match key="info.product" contains="Palm Handheld">
-          <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>
+
+   <!-- Garmin -->
+   <match key="usb_device.vendor_id" int="0x091e">
+      <!-- IQUE 3600 -->
+      <match key="usb_device.product_id" int="0x0004">
+        <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>
+
+
+   <!-- Kyocera -->
+   <match key="usb_device.vendor_id" int="0x0c88">
+      <!-- 7135 Smartphone -->
+      <match key="usb_device.product_id" int="0x0021">
+        <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>
+      <!-- 6035 Smartphone -->
+      <match key="usb_device.product_id" int="0xa226"> 
+         <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>
+
+
+   <!-- Tapwave -->
+   <match key="usb_device.vendor_id" int="0x12ef">
+      <!-- Zodiac, Zodiac2 -->
+      <match key="usb_device.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>
+
+   <!-- ACEECA -->
+   <match key="usb_device.vendor_id" int="0x4766">
+      <!-- MEZ1000 -->
+      <match key="usb_device.product_id" int="0x0001">
+        <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>
+   
 
   </device>
 </deviceinfo>


Index: pilot-link.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- pilot-link.spec	2 Mar 2008 15:54:52 -0000	1.73
+++ pilot-link.spec	3 Mar 2008 10:12:41 -0000	1.74
@@ -3,7 +3,7 @@
 
 Name: pilot-link
 Version: 0.12.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -26,6 +26,8 @@
 Patch6: pilot-link-0.12.2-open.patch
 Patch7: pilot-link-0.12.3-md5.patch
 Patch8: bluetooth-session-register.diff
+Patch9: pilot-link-0.12.2-Zire.patch
+
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -81,6 +83,7 @@
 %patch6 -p1 -b .open
 %patch7 -p1 -b .md5
 %patch8 -p0 -b .bluetooth-sdp
+%patch9 -p1 -b .Zire
 
 %build
 autoreconf -is
@@ -190,6 +193,11 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Mar  3 2008 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-10
+- Synchronize with F-8 branch:
+- add Z22 patch
+- change hal rules
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:0.12.3-9
 - Rebuild for perl 5.10 (again)
 
@@ -199,7 +207,7 @@
 * Mon Jan 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:0.12.3-7
 - rebuild for new perl
 
-* Fri Jan  11 2008 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-6
+* Fri Jan 11 2008 Ivana Varekova <varekova at redhat.com> - 2:0.12.3-6
 - Synchronize with F-8 branch:
 - remove visor modul remove from %post script
 - Change README.fedora use "ttyUSB[13579]" in 60-pilot.rules




More information about the fedora-extras-commits mailing list