Accepting request 249923 from GNOME:Factory

Update to 1.2.3 - no need for Staging:E

OBS-URL: https://build.opensuse.org/request/show/249923
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/colord?expand=0&rev=52

colord-1.2.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2db8c7002f7c859dce71a988de7c39f8370a6ab99a62b1037488208b43829bea
-size 1164544

colord-1.2.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2091fcca19d049136644e9dc6d56849b0e29d441a81a955d8f0e8135163474fc
+size 1177524

colord.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+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().
+      . Add ch_device_mode_from_firmware().
+      . 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
+
+- Update to version 1.2.2:
+  + New Features:
+    - Add a helper to calculate the ΔE of two colors.
+    - Bump the lcms2 dep to 2.6.
+    - Use the ColorHug sensor driver for the ColorHug2 hardware.
+  + Bugfixes:
+    - Actually parse the EDID for better duplicate detection.
+    - Actually write a file when using cd_icc_save_default().
+    - Do not try to return a CdIcc instance for virtual profiles.
+    - Use __attribute__(cleanup) to simplify memory cleanup.
+
+-------------------------------------------------------------------
+Fri Aug 22 09:29:50 UTC 2014 - meissner@suse.com
+
+- AppArmor profile: Allow sessions of greeter style seats also to
+  be read (bnc#893081).
+
 -------------------------------------------------------------------
 Tue Jul  1 17:47:51 UTC 2014 - dimstar@opensuse.org
 

colord.spec

@@ -19,7 +19,7 @@
 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
 
 Name:           colord
-Version:        1.2.1
+Version:        1.2.3
 Release:        0
 Summary:        System Daemon for Managing Color Devices
 License:        GPL-2.0+
@@ -41,7 +41,7 @@ BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(gusb) >= 0.1.1
-BuildRequires:  pkgconfig(lcms2) >= 2.4
+BuildRequires:  pkgconfig(lcms2) >= 2.6
 BuildRequires:  pkgconfig(libsystemd-login) >= 44
 BuildRequires:  pkgconfig(polkit-gobject-1) >= 0.103
 BuildRequires:  pkgconfig(sqlite3)
@@ -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
@@ -148,15 +150,21 @@ popd
 # 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
+%service_add_pre %{name}.service
 # Fix ownership of /var/lib/colord from first packages (in 12.1)
 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 +207,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)

usr.lib.colord

@@ -17,6 +17,7 @@
   /proc/*/cgroup r,
   /proc/*/cmdline r, # not only @{pid}, bnc#846301
   /run/systemd/sessions/[0-9]* r,
+  /run/systemd/sessions/c[0-9]* r,
   /run/udev/data/* r,
   /sys/bus/ r,
   /sys/bus/usb/devices/ r,