From c73ed9676c8d446eb718dda43a92c4b615aa618a Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 15 Mar 2012 17:18:48 +0000
Subject: [PATCH] New upstream version

- Add a Manager.CreateProfileWithFd() method for QtDBus
- Split out the SANE support into it's own process
- Fix a small leak when creating devices and profiles in clients
- Fix cd-fix-profile to add and remove metadata entries
- Install per-machine profiles in /var/lib/colord/icc
---
 .gitignore  |  1 +
 colord.spec | 22 +++++++++++++++++++---
 sources     |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3fdb897..837fc3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /colord-0.1.15.tar.xz
 /colord-0.1.16.tar.xz
 /colord-0.1.17.tar.xz
+/colord-0.1.18.tar.xz
diff --git a/colord.spec b/colord.spec
index 1a573b4..0164e8e 100644
--- a/colord.spec
+++ b/colord.spec
@@ -1,6 +1,6 @@
 Summary:   Color daemon
 Name:      colord
-Version:   0.1.17
+Version:   0.1.18
 Release:   1%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/colord/
@@ -11,7 +11,7 @@ BuildRequires: docbook-utils
 BuildRequires: gettext
 BuildRequires: glib2-devel
 BuildRequires: intltool
-BuildRequires: lcms2-devel
+BuildRequires: lcms2-devel >= 2.2
 BuildRequires: libgudev1-devel
 BuildRequires: polkit-devel >= 0.103
 BuildRequires: sane-backends-devel
@@ -78,6 +78,7 @@ exit 0
 %doc README AUTHORS NEWS COPYING
 %{_libexecdir}/colord
 %attr(755,colord,colord) %dir %{_localstatedir}/lib/colord
+%attr(755,colord,colord) %dir %{_localstatedir}/lib/colord/icc
 %{_bindir}/*
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.ColorManager.conf
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager*.xml
@@ -92,7 +93,14 @@ exit 0
 %{_libdir}/colord-sensors
 %{_libdir}/girepository-1.0/*.typelib
 %ghost %{_localstatedir}/lib/colord/*.db
-/usr/lib/systemd/system/*.service
+
+# TODO: split this out into a subpackage?
+/usr/lib/systemd/system/colord.service
+%{_datadir}/dbus-1/interfaces/org.freedesktop.colord.sane.xml
+%{_datadir}/dbus-1/system-services/org.freedesktop.colord-sane.service
+/usr/lib/systemd/system/colord-sane.service
+%{_libexecdir}/colord-sane
+%{_sysconfdir}/dbus-1/system.d/org.freedesktop.colord-sane.conf
 
 %files devel
 %defattr(-,root,root,-)
@@ -103,6 +111,14 @@ exit 0
 %{_datadir}/vala/vapi/*.vapi
 
 %changelog
+* Thu Mar 15 2012 Richard Hughes <richard@hughsie.com> 0.1.18-1
+- New upstream version
+- Add a Manager.CreateProfileWithFd() method for QtDBus
+- Split out the SANE support into it's own process
+- Fix a small leak when creating devices and profiles in clients
+- Fix cd-fix-profile to add and remove metadata entries
+- Install per-machine profiles in /var/lib/colord/icc
+
 * Wed Feb 22 2012 Richard Hughes <richard@hughsie.com> 0.1.17-1
 - New upstream version
 - Add an LED sample type
diff --git a/sources b/sources
index 57713d4..f1e11b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad566a5b874bd924d96051cc5da0a1d8  colord-0.1.17.tar.xz
+8c9bf54733e9862544860f1a8a9a61f9  colord-0.1.18.tar.xz