[argyllcms] Fix the ColorHug patch to not time out with firmware >= 1.1.1

[Richard Hughes]

commit 50e52fa4219f358580c3a07d8157c01c61c6d7a9
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Jan 25 16:32:18 2012 +0000

    Fix the ColorHug patch to not time out with firmware >= 1.1.1

 ...dd-an-experimental-ColorHug-sensor-driver.patch |    4 ++--
 argyllcms.spec                                     |    8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/0001-Add-an-experimental-ColorHug-sensor-driver.patch b/0001-Add-an-experimental-ColorHug-sensor-driver.patch
index 2edd6e8..38a7990 100644
--- a/0001-Add-an-experimental-ColorHug-sensor-driver.patch
+++ b/0001-Add-an-experimental-ColorHug-sensor-driver.patch
@@ -301,7 +301,7 @@ index 0000000..90f1b7e
 +}
 +
 +/* Converts a packed float to a double */
-+static double packed_float_to_double (uint32_t pf)
++static double packed_float_to_double (int32_t pf)
 +{
 +	return (double) pf / (double) 0x10000;
 +}
@@ -349,7 +349,7 @@ index 0000000..90f1b7e
 +	ev = colorhug_command(p, ch_take_reading,
 +						  ibuf, sizeof (ibuf),
 +						  (unsigned char *) obuf, sizeof (obuf),
-+						  1.0);
++						  5.0);
 +	if (ev != inst_ok)
 +		return ev;
 +
diff --git a/argyllcms.spec b/argyllcms.spec
index 73bd5e7..abb0ee6 100644
--- a/argyllcms.spec
+++ b/argyllcms.spec
@@ -1,6 +1,6 @@
 Name:    argyllcms
 Version: 1.3.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: ICC compatible color management system
 Group:   User Interface/X
 License: GPLv3 and MIT
@@ -56,6 +56,7 @@ This package contains the Argyll color management system documentation.
 %patch1 -p1 -b .add-colorhug-sensor
 autoreconf
 automake
+libtoolize --force
 
 # we're not allowed to refer to acquisition devices as scanners
 ./legal.sh
@@ -86,6 +87,11 @@ rm -rf %{buildroot}
 %doc doc/*.html doc/*.jpg doc/*.txt
 
 %changelog
+* Thu Jan 26 2012 Richard Hughes <rhughes at redhat.com> - 1.3.5-6
+- Fix the ColorHug patch to not time out with firmware >= 1.1.1 and to
+  correctly report negative numbers.
+- Re-libtoolize to fix compile failure on rawhide.
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild