New upstream version

- Add a create-standard-space sub-command to cd-create-profile
- Add a profile metadata key of 'License'
- Add a set-version command to the cd-fix-profile command line tool
- Create linear vcgt tables when using create-x11-gamma
- Fix GetStandardSpace so it can actually work
- Move the named color examples to shared-color-profiles

.gitignore

@@ -22,3 +22,4 @@
 /colord-0.1.22.tar.xz
 /colord-0.1.23.tar.xz
 /colord-0.1.24.tar.xz
+/colord-0.1.25.tar.xz

0001-Do-not-try-to-connect-to-colord-in-cd-fix-profile-un.patch

@@ -1,48 +0,0 @@
-From 49cc45deb53b879c904fd2ce059277db9c87a9f8 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Wed, 21 Nov 2012 21:38:01 +0000
-Subject: [PATCH] Do not try to connect to colord in cd-fix-profile until
- actually needed
-
-This speeds up the startup of the tool and also means it can be used on build
-servers without colord or DBus running.
----
- client/cd-fix-profile.c | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/client/cd-fix-profile.c b/client/cd-fix-profile.c
-index d968e8b..3a481cf 100644
---- a/client/cd-fix-profile.c
-+++ b/client/cd-fix-profile.c
-@@ -384,11 +384,14 @@ cd_util_get_standard_space_filename (CdUtilPrivate *priv,
- 				     CdStandardSpace standard_space,
- 				     GError **error)
- {
--	CdProfile *profile_tmp;
-+	CdProfile *profile_tmp = NULL;
- 	gboolean ret;
- 	gchar *filename = NULL;
- 
- 	/* try to find */
-+	ret = cd_client_connect_sync (priv->client, NULL, error);
-+	if (!ret)
-+		goto out;
- 	profile_tmp = cd_client_get_standard_space_sync (priv->client,
- 							 standard_space,
- 							 NULL,
-@@ -1101,12 +1104,6 @@ main (int argc, char *argv[])
- 	/* create helper object */
- 	priv = g_new0 (CdUtilPrivate, 1);
- 	priv->client = cd_client_new ();
--	ret = cd_client_connect_sync (priv->client, NULL, &error);
--	if (!ret) {
--		g_print ("%s\n", error->message);
--		g_error_free (error);
--		goto out;
--	}
- 
- 	/* add commands */
- 	priv->cmd_array = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_util_item_free);
--- 
-1.8.0
-

colord.spec

@@ -1,14 +1,11 @@
 Summary:   Color daemon
 Name:      colord
-Version:   0.1.24
+Version:   0.1.25
-Release:   2%{?dist}
+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-Do-not-try-to-connect-to-colord-in-cd-fix-profile-un.patch
-
 BuildRequires: dbus-devel
 BuildRequires: docbook-utils
 BuildRequires: gettext
@@ -57,7 +54,6 @@ when running GTK applications.
 
 %prep
 %setup -q
-%patch1 -p1 -b .cd-fix-profile
 
 %build
 %configure \
@@ -110,8 +106,6 @@ exit 0
 %{_libdir}/libcolord.so.*
 %config %{_sysconfdir}/colord.conf
 /usr/lib/udev/rules.d/*.rules
-%dir %{_datadir}/color/icc/colord
-%{_datadir}/color/icc/colord/*.ic?
 %{_libdir}/colord-sensors
 %{_libdir}/colord-plugins
 %{_libdir}/girepository-1.0/*.typelib
@@ -133,6 +127,15 @@ exit 0
 %{_datadir}/gtk-doc/html/colord/*
 
 %changelog
+* Mon Nov 26 2012 Richard Hughes <richard@hughsie.com> 0.1.25-1
+- New upstream version
+- Add a create-standard-space sub-command to cd-create-profile
+- Add a profile metadata key of 'License'
+- Add a set-version command to the cd-fix-profile command line tool
+- Create linear vcgt tables when using create-x11-gamma
+- Fix GetStandardSpace so it can actually work
+- Move the named color examples to shared-color-profiles
+
 * Wed Nov 21 2012 Richard Hughes <richard@hughsie.com> 0.1.24-2
 - Apply a patch from upstream so we can use cd-fix-profile in
   situations without D-Bus.

sources

@@ -1 +1 @@
-1e7c4164c35b8415af108fb2a0db7e1f  colord-0.1.24.tar.xz
+85549f99d36c0436db8b9c764215c584  colord-0.1.25.tar.xz