rpms/hal-info/devel hal-info-20080317-sierra-595U.patch, NONE, 1.1 hal-info.spec, 1.17, 1.18 hal-info-20080215-kpc650.patch, 1.1, NONE

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/pkgs/rpms/hal-info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv520

Modified Files:
	hal-info.spec 
Added Files:
	hal-info-20080317-sierra-595U.patch 
Removed Files:
	hal-info-20080215-kpc650.patch 
Log Message:
* Fri Mar 28 2008 Dan Williams <dcbw at redhat.com> - 20080317-2
- Fix for Sierra 595U and others (rh #439536)



hal-info-20080317-sierra-595U.patch:

--- NEW FILE hal-info-20080317-sierra-595U.patch ---
commit a931edfebb28da0a9fa6e39224e11b3e43c410e3
Author: Dan Williams <dcbw at redhat.com>
Date:   Fri Mar 28 18:31:38 2008 -0400

    Tag only serial.port=0 as a modem

diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 3aec9b8..5735811 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -57,8 +57,10 @@
         <!-- EM5625,2x MC5720,2x MC5725,AirCard 595,AirCard 597E,USB Dongle 595U,AirCard 580 -->
         <match key="@info.parent:usb.product_id" int_outof="0x0017;0x0018;0x0218;0x0020;0x0220;0x0019;0x0021;0x0120;0x0112">
           <match key="@info.parent:usb.interface.number" int="0">
-            <append key="info.capabilities" type="strlist">modem</append>
-            <append key="modem.command_sets" type="strlist">IS-707-A</append>
+            <match key="serial.port" int="0">
+              <append key="info.capabilities" type="strlist">modem</append>
+              <append key="modem.command_sets" type="strlist">IS-707-A</append>
+            </match>
           </match>
         </match>
 	<!-- 2x MC8755,MC8765,MC8775 & AC 875U,MC8775,AirCard 875,MC8780,MC8781,AirCard 880,AirCard 881,AirCard 880 E,AirCard 881 E, -->


Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- hal-info.spec	23 Mar 2008 10:05:11 -0000	1.17
+++ hal-info.spec	28 Mar 2008 22:40:42 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Device information files for HAL
 Name: hal-info
 Version: 20080317
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: AFL or GPLv2
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
@@ -9,10 +9,11 @@
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 
-Patch0: hal-info-20080215-kpc650.patch
+# Upstream already; commit a931edfebb28da0a9fa6e39224e11b3e43c410e3
+Patch0: hal-info-20080317-sierra-595U.patch
 
 Requires: hal >= 0.5.10
-BuildRequires: hal-devel >= 0.5.10
+#BuildRequires: hal-devel >= 0.5.10
 
 %description 
 The hal-info package contains various device information files (also
@@ -21,7 +22,7 @@
 %prep
 %setup -q
 
-%patch -p1 -b .kpc650
+%patch -p1 -b .595u
 
 %build
 %configure
@@ -40,6 +41,9 @@
 %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi
 
 %changelog
+* Fri Mar 28 2008 Dan Williams <dcbw at redhat.com> - 20080317-2
+- Fix for Sierra 595U and others (rh #439536)
+
 * Sun Mar 23 2008 Lubomir Kundrak <lkundrak at redhat.com> - 20080317-1
 - Update to latest upstream release
 


--- hal-info-20080215-kpc650.patch DELETED ---