From f889d2e14c96362bdab6794b4d7af263466abbbf Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Wed, 8 Apr 2015 20:43:07 +0100
Subject: [PATCH] New upstream version

---
 .gitignore                                    |  1 +
 ...n-helper-failing-to-find-argyll-tool.patch | 30 -------------------
 colord.spec                                   | 12 ++++----
 sources                                       |  2 +-
 4 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 0001-Fix-session-helper-failing-to-find-argyll-tool.patch

diff --git a/.gitignore b/.gitignore
index 26e208b..f886658 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@
 /colord-1.2.7.tar.xz
 /colord-1.2.8.tar.xz
 /colord-1.2.9.tar.xz
+/colord-1.2.10.tar.xz
diff --git a/0001-Fix-session-helper-failing-to-find-argyll-tool.patch b/0001-Fix-session-helper-failing-to-find-argyll-tool.patch
deleted file mode 100644
index d9227ea..0000000
--- a/0001-Fix-session-helper-failing-to-find-argyll-tool.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 301f24d02158f1e12a2e7ccdf9970d02ecddd534 Mon Sep 17 00:00:00 2001
-From: Tim Waugh <twaugh@redhat.com>
-Date: Mon, 23 Feb 2015 09:56:12 +0000
-Subject: [PATCH] Fix session-helper failing to find argyll tool.
-
-We don't want to free the thing we're trying to return. This fixes the
-bug introduced in commit b6f7c4d117a06f059a6e852e2dce8c13a3bb1f2c.
-
-See:
-  https://bugzilla.redhat.com/show_bug.cgi?id=1190720
----
- contrib/session-helper/cd-main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/session-helper/cd-main.c b/contrib/session-helper/cd-main.c
-index 61e0c5b..0f93697 100644
---- a/contrib/session-helper/cd-main.c
-+++ b/contrib/session-helper/cd-main.c
-@@ -939,7 +939,7 @@ cd_main_find_argyll_tool (const gchar *command,
- 			  GError **error)
- {
- 	gboolean ret;
--	_cleanup_free_ gchar *filename = NULL;
-+	gchar *filename;
- 
- 	/* try the original argyllcms filename installed in /usr/local/bin */
- 	filename = g_strdup_printf ("/usr/local/bin/%s", command);
--- 
-2.1.0
-
diff --git a/colord.spec b/colord.spec
index 54030fb..c3f8ab8 100644
--- a/colord.spec
+++ b/colord.spec
@@ -18,15 +18,12 @@
 
 Summary:   Color daemon
 Name:      colord
-Version:   1.2.9
-Release:   2%{?dist}
+Version:   1.2.10
+Release:   1%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/colord/
 Source0:   http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
 
-# Already upstream
-Patch1:    0001-Fix-session-helper-failing-to-find-argyll-tool.patch
-
 BuildRequires: dbus-devel
 BuildRequires: docbook-utils
 BuildRequires: gettext
@@ -110,7 +107,6 @@ This may be useful for CMYK soft-proofing or for extra device support.
 
 %prep
 %setup -q
-%patch1 -p1 -b .fix-calibration
 
 %build
 # Set ~2 GiB limit so that colprof is forced to work in chunks when
@@ -284,6 +280,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gtk-doc/html/colord/*
 
 %changelog
+* Wed Apr 08 2015 Richard Hughes <richard@hughsie.com> 1.2.10-1
+- New upstream version
+- Add a vendor quirk for Google
+
 * Mon Mar 09 2015 Richard Hughes <richard@hughsie.com> 1.2.9-2
 - Fix a crash when calibrating.
 - Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1190720
diff --git a/sources b/sources
index ab4e008..dd40e85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57652634e4d13c45b7dacf658820d3fb  colord-1.2.9.tar.xz
+02f3e9cbb24a375bb981e680fae8e9be  colord-1.2.10.tar.xz