[colord/f16] Backport a patch from upstream to allow all the colorimeter devices to work, even without a native d

[Richard Hughes]

commit 491e34936208b66fda26868daf227db73fbbcaad
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Oct 17 11:59:22 2011 +0100

    Backport a patch from upstream to allow all the colorimeter devices
    to work, even without a native driver.
    Require color-filesystem explicitly rather than getting it from the
    shared-color-profiles package.

 colord.spec        |   12 +++++++++++-
 fix-non-huey.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/colord.spec b/colord.spec
index af72c6e..3448515 100644
--- a/colord.spec
+++ b/colord.spec
@@ -1,10 +1,11 @@
 Summary:   Color daemon
 Name:      colord
 Version:   0.1.13
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/colord/
 Source0:   http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
+Patch0:    fix-non-huey.patch
 
 BuildRequires: dbus-devel
 BuildRequires: docbook-utils
@@ -19,7 +20,9 @@ BuildRequires: sane-backends-devel
 BuildRequires: sqlite-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: vala-tools
+
 Requires: shared-color-profiles
+Requires: color-filesystem
 
 %description
 colord is a low level system activated daemon that maps color devices
@@ -34,6 +37,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-other-colorimeter
 
 %build
 %configure \
@@ -90,6 +94,12 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
 %{_datadir}/vala/vapi/*.vapi
 
 %changelog
+* Mon Oct 17 2011 Richard Hughes <richard at hughsie.com> 0.1.13-2
+- Backport a patch from upstream to allow all the colorimeter devices
+  to work, even without a native driver.
+- Require color-filesystem explicitly rather than getting it from the
+  shared-color-profiles package.
+
 * Mon Oct 03 2011 Richard Hughes <richard at hughsie.com> 0.1.13-1
 - New upstream version
 - Ensure uid 0 can always create devices and profiles
diff --git a/fix-non-huey.patch b/fix-non-huey.patch
new file mode 100644
index 0000000..012417b
--- /dev/null
+++ b/fix-non-huey.patch
@@ -0,0 +1,27 @@
+commit 07cbcd479066998e70e9f45b330672458555bb5d
+Author: Richard Hughes <richard at hughsie.com>
+Date:   Mon Oct 10 11:31:25 2011 +0100
+
+    Ensure non-native device are added with no driver module installed
+    
+    This makes all colorimeter device that are not Hueys work.
+
+diff --git a/src/cd-udev-client.c b/src/cd-udev-client.c
+index 9a4f82a..a24f7f9 100644
+--- a/src/cd-udev-client.c
++++ b/src/cd-udev-client.c
+@@ -240,10 +240,10 @@ cd_udev_client_sensor_add (CdUdevClient *udev_client,
+ 	/* load the sensor */
+ 	ret = cd_sensor_load (sensor, &error);
+ 	if (!ret) {
+-		g_warning ("CdUdevClient: failed to load sensor: %s",
+-			    error->message);
+-		g_error_free (error);
+-		goto out;
++		/* not fatal, non-native devices are still useable */
++		g_debug ("CdUdevClient: failed to load native sensor: %s",
++			 error->message);
++		g_clear_error (&error);
+ 	}
+ 
+ 	/* signal the addition */