[argyllcms/f17] ColorHug has it's own vendor and product IDs now.

[Richard Hughes]

commit fb18297ca2364b766a46fd7542c3fcc12ec88252
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue May 22 18:18:29 2012 +0100

    ColorHug has it's own vendor and product IDs now.

 ColorHug-has-its-own-usb-vid-now.patch |   22 ++++++++++++++++++++++
 argyllcms.spec                         |    7 ++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/ColorHug-has-its-own-usb-vid-now.patch b/ColorHug-has-its-own-usb-vid-now.patch
new file mode 100644
index 0000000..f23ec08
--- /dev/null
+++ b/ColorHug-has-its-own-usb-vid-now.patch
@@ -0,0 +1,22 @@
+--- hargyllcms-1.3.6/spectro/insttypes.c.old	2012-05-21 14:46:50.125230249 +0100
++++ hargyllcms-1.3.6/spectro/insttypes.c	2012-05-21 14:48:23.260223881 +0100
+@@ -198,11 +198,19 @@ unsigned short idProduct) {
+ 			return instSpyder4;
+ 	}
+ 
++	/* this is deprecated */
+ 	if (idVendor == 0x04d8) {		/* Microchip */
+ 		if (idProduct == 0xf8da) {	/* Hughski ColorHug */
+ 			return instColorHug;
+ 		}
+ 	}
++
++	/* this is for ColorHug firmware >= 0.1.20 */
++	if (idVendor == 0x273f) {		/* Hughski Limited */
++		if (idProduct == 0x1001) {	/* ColorHug */
++			return instColorHug;
++		}
++	}
+ 	/* Add other instruments here */
+ 
+ 	return instUnknown;
diff --git a/argyllcms.spec b/argyllcms.spec
index 7abbaf5..df7713a 100644
--- a/argyllcms.spec
+++ b/argyllcms.spec
@@ -1,11 +1,12 @@
 Name:    argyllcms
 Version: 1.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: ICC compatible color management system
 Group:   User Interface/X
 License: GPLv3 and MIT
 URL:     http://gitorious.org/hargyllcms
 Source0: http://people.freedesktop.org/~hughsient/releases/hargyllcms-%{version}.tar.xz
+Patch0:  ColorHug-has-its-own-usb-vid-now.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -51,6 +52,7 @@ This package contains the Argyll color management system documentation.
 
 %prep
 %setup -q -n hargyllcms-%{version}
+%patch0 -p1 -b .colorhug-vid-pid
 autoreconf
 automake
 libtoolize --force
@@ -91,6 +93,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libargyll*.so
 %doc doc/*.html doc/*.jpg
 
 %changelog
+* Tue May 22 2012 Richard Hughes <rhughes at redhat.com> - 1.4.0-2
+- ColorHug has it's own vendor and product IDs now.
+
 * Fri Apr 20 2012 Richard Hughes <rhughes at redhat.com> - 1.4.0-1
 - Update to latest upstream release
 - A colorimeter can now be used as a reference to make ccmx files