Accepting request 197554 from home:fcrozat:branches:GNOME:Factory

- Add colord-udev-hwdb.patch: call udev hwdb to fill appropriately
  usb device informations (backport from upstream GIT).

OBS-URL: https://build.opensuse.org/request/show/197554
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord?expand=0&rev=79

colord-udev-hwdb.patch

@@ -0,0 +1,29 @@
+From fd9654c786cb19b541d20a953c5b51c0f53caeea Mon Sep 17 00:00:00 2001
+From: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
+Date: Sat, 3 Aug 2013 17:55:36 +0200
+Subject: [PATCH] Migrate from usb_id and usb_db to udev builtins usb_id and
+ hwdb
+
+Signed-off-by: Richard Hughes <richard@hughsie.com>
+---
+ rules/69-cd-sensors.rules.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rules/69-cd-sensors.rules.in b/rules/69-cd-sensors.rules.in
+index 6e0a643..eb47e25 100644
+--- a/rules/69-cd-sensors.rules.in
++++ b/rules/69-cd-sensors.rules.in
+@@ -86,8 +86,8 @@ ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1002", ENV{COLORD_SENSOR_KIND}="colo
+ 
+ # color calibration device
+ ENV{COLORD_SENSOR_KIND}=="*?", ENV{COLOR_MEASUREMENT_DEVICE}="1"
+-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{program}="usb_id --export %p"
+-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{program}="usb-db %p"
++ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id"
++ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{builtin}="hwdb --subsystem=usb"
+ 
+ # Allow the daemon to access the color devices
+ ENV{COLORD_SENSOR_KIND}=="*?", GROUP="@daemon_user@"
+-- 
+1.8.4
+

colord.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul 31 17:31:04 UTC 2013 - fcrozat@suse.com
+
+- Add colord-udev-hwdb.patch: call udev hwdb to fill appropriately
+  usb device informations (backport from upstream GIT).
+
 -------------------------------------------------------------------
 Tue Jul 30 16:24:33 UTC 2013 - dimstar@opensuse.org
 

colord.spec

@@ -29,6 +29,8 @@ Source0:        http://www.freedesktop.org/software/colord/releases/%{name}-%{ve
 # Apparmor profile
 Source1:        usr.lib.colord
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM colord-udev-hwdb.patch fcrozat@suse.com -- call udev hwdb to fill appropriate data about usb devices
+Patch0:         colord-udev-hwdb.patch
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
 BuildRequires:  vala
@@ -118,6 +120,7 @@ there are no users logged in.
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \