From 89e7802e9270307dad50ed061879cca504a0be8f Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Tue, 17 Jan 2012 12:04:42 +0000
Subject: [PATCH] New upstream version Now runs as a colord user rather than as
 root. Support more ICC metadata keys Install a systemd service file Support
 2nd generation Huey hardware

---
 .gitignore  |  1 +
 colord.spec | 26 +++++++++++++++++++++-----
 sources     |  2 +-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index ef9953a..5c57bc6 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.16.tar.xz
diff --git a/colord.spec b/colord.spec
index e8254d0..e1fe4dd 100644
--- a/colord.spec
+++ b/colord.spec
@@ -1,7 +1,7 @@
 Summary:   Color daemon
 Name:      colord
-Version:   0.1.15
-Release:   2%{?dist}
+Version:   0.1.16
+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
@@ -13,8 +13,7 @@ BuildRequires: glib2-devel
 BuildRequires: intltool
 BuildRequires: lcms2-devel
 BuildRequires: libgudev1-devel
-BuildRequires: libusb1-devel
-BuildRequires: polkit-devel
+BuildRequires: polkit-devel >= 0.103
 BuildRequires: sane-backends-devel
 BuildRequires: sqlite-devel
 BuildRequires: gobject-introspection-devel
@@ -23,6 +22,7 @@ BuildRequires: libgusb-devel
 
 Requires: shared-color-profiles
 Requires: color-filesystem
+Requires(pre): shadow-utils
 
 %description
 colord is a low level system activated daemon that maps color devices
@@ -40,6 +40,7 @@ Files for development with %{name}.
 
 %build
 %configure \
+        --with-daemon-user=colord \
         --disable-static \
         --disable-rpath \
         --disable-examples \
@@ -60,6 +61,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
@@ -68,7 +76,7 @@ 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
 %{_bindir}/*
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.ColorManager.conf
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager*.xml
@@ -83,6 +91,7 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
 %{_libdir}/colord-sensors
 %{_libdir}/girepository-1.0/*.typelib
 %ghost %{_localstatedir}/lib/colord/*.db
+/lib/systemd/system/*.service
 
 %files devel
 %defattr(-,root,root,-)
@@ -93,6 +102,13 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
 %{_datadir}/vala/vapi/*.vapi
 
 %changelog
+* Tue Jan 17 2012 Richard Hughes <richard@hughsie.com> 0.1.16-1
+- New upstream version
+- Now runs as a colord user rather than as root.
+- Support more ICC metadata keys
+- Install a systemd service file
+- Support 2nd generation Huey hardware
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index c484e30..eb51f59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f212cbc7eece3fa403c1507fc8b10dbb  colord-0.1.15.tar.xz
+cb73ffdcebe4c06852c48355e83a4bc4  colord-0.1.16.tar.xz