rpms/hal/devel hal-0.5.4-match-on-capabilities.patch, NONE, 1.1 hal.spec, 1.63, 1.64

[fedora-cvs-commits at redhat.com]

Author: johnp

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7956

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.4-match-on-capabilities.patch 
Log Message:
- Add patch to fix storage policy fdi to match on the storage
  capability and not category.



hal-0.5.4-match-on-capabilities.patch:
 10-storage-policy.fdi |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hal-0.5.4-match-on-capabilities.patch ---
--- hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi.match-on-capabilities	2005-11-08 14:29:57.000000000 -0500
+++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi	2005-11-08 14:30:23.000000000 -0500
@@ -17,7 +17,7 @@
 
   <device>
     <!-- Whitelist bus types of storage devices we care about  -->
-    <match key="info.category" string="storage">
+    <match key="info.capabilities" contains="storage">
       <match key="storage.bus" string="mmc">
 	<merge key="storage.policy.should_mount" type="bool">true</merge>      
       </match>


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- hal.spec	3 Oct 2005 05:46:56 -0000	1.63
+++ hal.spec	8 Nov 2005 21:58:27 -0000	1.64
@@ -18,9 +18,10 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.4
-Release: 3
+Release: 4 
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
+Patch0: hal-0.5.4-match-on-capabilities.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -79,7 +80,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .match-on-capabilities
 %build
 
 %configure --disable-docbook-docs --enable-fstab-sync --with-os-type=redhat --enable-pcmcia-support --with-stab-file=/var/lib/pcmcia/stab
@@ -174,6 +175,10 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Tue Nov 08 2005 John (J5) Palmieri <johnp at redhat.com> - 0.5.4-4
+- Add patch to fix storage policy fdi to match on the storage
+  capability and not category.
+  
 * Mon Oct  3 2005 Matthias Clasen <mclasen at redhat.com>
 - Fix a typo in description