From 404884ec06579c8701f52fa14c8d6ae82ae4c1b7c2dc8073d7596cac2ef11746 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 17 Sep 2014 10:23:39 +0000
Subject: [PATCH] Accepting request 249914 from multimedia:color_management

- Update to version 1.2.3:
  New Features:
  - colorhug: Add ch_device_check_firmware()
  - colorhug: Add ch_device_mode_from_firmware()
  - colorhug: Use a different PID for the ColorHug2 bootloader
  Bugfixes:
  - Fix the device path to allow uid or username to be omitted
  - There is no seat if running in a chroot
- add systemd %pre and %post macros for colord.service
- add rccolord symlink

OBS-URL: https://build.opensuse.org/request/show/249914
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord?expand=0&rev=107
---
 colord-1.2.2.tar.xz |  3 ---
 colord-1.2.3.tar.xz |  3 +++
 colord.changes      | 17 +++++++++++++++++
 colord.spec         | 14 +++++++++++++-
 4 files changed, 33 insertions(+), 4 deletions(-)
 delete mode 100644 colord-1.2.2.tar.xz
 create mode 100644 colord-1.2.3.tar.xz

diff --git a/colord-1.2.2.tar.xz b/colord-1.2.2.tar.xz
deleted file mode 100644
index 495ff51..0000000
--- a/colord-1.2.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9059710321a231657932dd9f824a0cd5b71f90e2812c219f336ee1693066529
-size 1176008
diff --git a/colord-1.2.3.tar.xz b/colord-1.2.3.tar.xz
new file mode 100644
index 0000000..b016f58
--- /dev/null
+++ b/colord-1.2.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2091fcca19d049136644e9dc6d56849b0e29d441a81a955d8f0e8135163474fc
+size 1177524
diff --git a/colord.changes b/colord.changes
index 4d0199b..dba313a 100644
--- a/colord.changes
+++ b/colord.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Sep 15 06:47:53 UTC 2014 - kkaempf@suse.com
+
+- Update to version 1.2.3:
+  New Features:
+  - colorhug: Add ch_device_check_firmware()
+  - colorhug: Add ch_device_mode_from_firmware()
+  - colorhug: Use a different PID for the ColorHug2 bootloader
+
+  Bugfixes:
+  - Fix the device path to allow uid or username to be omitted
+  - There is no seat if running in a chroot
+
+- add systemd %pre and %post macros for colord.service
+
+- add rccolord symlink
+
 -------------------------------------------------------------------
 Sat Aug 23 21:27:22 UTC 2014 - dimstar@opensuse.org
 
diff --git a/colord.spec b/colord.spec
index d8eb35c..8b6809b 100644
--- a/colord.spec
+++ b/colord.spec
@@ -19,7 +19,7 @@
 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
 
 Name:           colord
-Version:        1.2.2
+Version:        1.2.3
 Release:        0
 Summary:        System Daemon for Managing Color Devices
 License:        GPL-2.0+
@@ -128,6 +128,8 @@ make %{?_smp_mflags}
 
 %install
 %make_install
+mkdir $RPM_BUILD_ROOT%{_sbindir}
+ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rc%{name}
 find %{buildroot} -type f -name '*.la' -delete -print
 
 mkdir %{buildroot}/etc/apparmor.d
@@ -144,7 +146,11 @@ test ! -f *.[2-9]
 popd
 %find_lang %{name}
 
+# follow http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines
+
 %pre
+%service_add_pre %{name}.service
+
 # Create colord user
 getent group colord >/dev/null || groupadd -r colord
 getent passwd colord >/dev/null || useradd -r -g colord -d %{_localstatedir}/lib/colord -s /sbin/nologin -c "user for colord" colord
@@ -152,11 +158,16 @@ getent passwd colord >/dev/null || useradd -r -g colord -d %{_localstatedir}/lib
 test ! -d %{_localstatedir}/lib/colord || chown -R colord:colord %{_localstatedir}/lib/colord
 exit 0
 
+%preun
+%service_del_preun %{name}.service
+
 %post
 %glib2_gsettings_schema_post
+%service_add_post %{name}.service
 
 %postun
 %glib2_gsettings_schema_postun
+%service_del_postun %{name}.service
 
 %post -n libcolord2 -p /sbin/ldconfig
 
@@ -199,6 +210,7 @@ exit 0
 %{_libdir}/colord-plugins/libcd_plugin_scanner.so
 # These should not be here.. this is ugly (fdo#60733)
 #{_libdir}/lib*private.*
+%{_sbindir}/rc%{name}
 
 %files -n libcolord2
 %defattr(-, root, root)