[colord/f16] New upstream version

[Richard Hughes]

commit 175d085ee76b8a14bd1331b4f515b2055018171c
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Mar 29 18:09:36 2012 +0100

    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 |   43 ++++++++++++++++++++++++++++++-------------
 sources     |    2 +-
 3 files changed, 32 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ef9953a..6d704a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /colord-0.1.13.tar.xz
 /colord-0.1.14.tar.xz
 /colord-0.1.15.tar.xz
+/colord-0.1.18.tar.xz
diff --git a/colord.spec b/colord.spec
index 4a70b7c..f0dc780 100644
--- a/colord.spec
+++ b/colord.spec
@@ -1,25 +1,17 @@
 Summary:   Color daemon
 Name:      colord
-Version:   0.1.15
-
-# BIG FAT WARNING:
-# Don't update to 0.1.16 before selinux policy >= 3.10.0-73 is available
-# in the F16 updates-testing repo
-
-Release:   2%{?dist}
+Version:   0.1.18
+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...
-Patch0:    0001-colorhug-Bump-the-sample-timeout-to-5-seconds.patch
-
 BuildRequires: dbus-devel
 BuildRequires: docbook-utils
 BuildRequires: gettext
 BuildRequires: glib2-devel
 BuildRequires: intltool
-BuildRequires: lcms2-devel
+BuildRequires: lcms2-devel >= 2.2
 BuildRequires: libgudev1-devel
 BuildRequires: libusb1-devel
 BuildRequires: polkit-devel
@@ -31,6 +23,8 @@ BuildRequires: libgusb-devel
 
 Requires: shared-color-profiles
 Requires: color-filesystem
+Requires: systemd-units
+Requires(pre): shadow-utils
 
 %description
 colord is a low level system activated daemon that maps color devices
@@ -45,7 +39,6 @@ Files for development with %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-colorhug
 
 %build
 %configure \
@@ -69,6 +62,13 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
 
 %find_lang %{name}
 
+%pre
+getent group colord >/dev/null || groupadd -r colord
+getent passwd colord >/dev/null || \
+    useradd -r -g colord -d /var/lib/colord -s /sbin/nologin \
+    -c "User for colord" colord
+exit 0
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -77,7 +77,8 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
 %defattr(-,root,root,-)
 %doc README AUTHORS NEWS COPYING
 %{_libexecdir}/colord
-%dir %{_localstatedir}/lib/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
@@ -93,6 +94,14 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
 %{_libdir}/girepository-1.0/*.typelib
 %ghost %{_localstatedir}/lib/colord/*.db
 
+# TODO: split this out into a subpackage?
+/lib/systemd/system/colord.service
+%{_datadir}/dbus-1/interfaces/org.freedesktop.colord.sane.xml
+%{_datadir}/dbus-1/system-services/org.freedesktop.colord-sane.service
+/lib/systemd/system/colord-sane.service
+%{_libexecdir}/colord-sane
+%{_sysconfdir}/dbus-1/system.d/org.freedesktop.colord-sane.conf
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/colord-1
@@ -102,6 +111,14 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
 %{_datadir}/vala/vapi/*.vapi
 
 %changelog
+* Thu Mar 15 2012 Richard Hughes <richard at 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 Jan 25 2012 Richard Hughes <richard at hughsie.com> 0.1.15-2
 - Fix the ColorHug driver to not time out on dark reads with firmware
   versions >= 1.1.2
diff --git a/sources b/sources
index c484e30..f1e11b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f212cbc7eece3fa403c1507fc8b10dbb  colord-0.1.15.tar.xz
+8c9bf54733e9862544860f1a8a9a61f9  colord-0.1.18.tar.xz