rpms/hal/devel 05-olpc-detect.fdi,1.1,1.2 hal.spec,1.172,1.173

[Jeremy Katz]

Author: katzj

Update of /cvs/pkgs/rpms/hal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17079

Modified Files:
	05-olpc-detect.fdi hal.spec 
Log Message:
* Wed Nov  5 2008 Jeremy Katz <katzj at redhat.com> - 0.5.12-12.20081027git
- Fix up OLPC detection with regard to what's in the upstream kernel



Index: 05-olpc-detect.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/05-olpc-detect.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 05-olpc-detect.fdi	5 Nov 2008 09:36:24 -0000	1.1
+++ 05-olpc-detect.fdi	5 Nov 2008 19:25:21 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?> 
 <deviceinfo version="0.2">
   <device>
-    <match key="info.product" string="OLPC ALPS HGPK">
+    <match key="info.product" string="OLPC HGPK ALPS HGPK">
       <merge key="/org/freedesktop/Hal/devices/computer:system.hardware.product" type="string">C2</merge>
       <merge key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" type="string">OLPC</merge>
       <merge key="/org/freedesktop/Hal/devices/computer:system.hardware.version" type="string">OLPC C2</merge>


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- hal.spec	5 Nov 2008 17:31:44 -0000	1.172
+++ hal.spec	5 Nov 2008 19:25:21 -0000	1.173
@@ -28,7 +28,7 @@
 Name: hal
 Version: 0.5.12
 #Release: 5%{?dist}
-Release: 11.%{?alphatag}%{?dist}
+Release: 12.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 #Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
@@ -289,6 +289,9 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Wed Nov  5 2008 Jeremy Katz <katzj at redhat.com> - 0.5.12-12.20081027git
+- Fix up OLPC detection with regard to what's in the upstream kernel
+
 * Wed Nov 05 2008 Matthew Garrett <mjg at redhat.com> - 0.5.12-11.20081027git
 - Add support for the memstick bus