From d45d56f0b4ccfa4e7bbf21f526a1cac37bf433f96fbf0f6910f84816327b2512 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 22 Aug 2014 11:04:16 +0000 Subject: [PATCH 1/5] Accepting request 245737 from home:msmeissn:branches:GNOME:Factory - allow sessions of greeter style seats also to be read. bnc#893081 OBS-URL: https://build.opensuse.org/request/show/245737 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord?expand=0&rev=104 --- colord.changes | 5 +++++ usr.lib.colord | 1 + 2 files changed, 6 insertions(+) diff --git a/colord.changes b/colord.changes index 97e19b8..92ed2a2 100644 --- a/colord.changes +++ b/colord.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 22 09:29:50 UTC 2014 - meissner@suse.com + +- allow sessions of greeter style seats also to be read. bnc#893081 + ------------------------------------------------------------------- Tue Jul 1 17:47:51 UTC 2014 - dimstar@opensuse.org diff --git a/usr.lib.colord b/usr.lib.colord index 5d21902..a6f9072 100644 --- a/usr.lib.colord +++ b/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, From ee8966c04083017dd4fc420ed8a5a3a36e318a9a167d168ccbc8a53d0a3886b0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 22 Aug 2014 11:04:44 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord?expand=0&rev=105 --- colord.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/colord.changes b/colord.changes index 92ed2a2..2c4b6f7 100644 --- a/colord.changes +++ b/colord.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Fri Aug 22 09:29:50 UTC 2014 - meissner@suse.com -- allow sessions of greeter style seats also to be read. bnc#893081 +- 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 From 5eaa69181783ed63156433f6ffc4c4833ec08b0f686d8e670620f6a198091613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sun, 24 Aug 2014 10:03:57 +0000 Subject: [PATCH 3/5] Accepting request 246134 from home:dimstar:branches:GNOME:Factory Update to 1.2.2 OBS-URL: https://build.opensuse.org/request/show/246134 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord?expand=0&rev=106 --- colord-1.2.1.tar.xz | 3 --- colord-1.2.2.tar.xz | 3 +++ colord.changes | 14 ++++++++++++++ colord.spec | 4 ++-- 4 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 colord-1.2.1.tar.xz create mode 100644 colord-1.2.2.tar.xz diff --git a/colord-1.2.1.tar.xz b/colord-1.2.1.tar.xz deleted file mode 100644 index fa64a28..0000000 --- a/colord-1.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2db8c7002f7c859dce71a988de7c39f8370a6ab99a62b1037488208b43829bea -size 1164544 diff --git a/colord-1.2.2.tar.xz b/colord-1.2.2.tar.xz new file mode 100644 index 0000000..495ff51 --- /dev/null +++ b/colord-1.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9059710321a231657932dd9f824a0cd5b71f90e2812c219f336ee1693066529 +size 1176008 diff --git a/colord.changes b/colord.changes index 2c4b6f7..4d0199b 100644 --- a/colord.changes +++ b/colord.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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 diff --git a/colord.spec b/colord.spec index 1a56206..d8eb35c 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.1 +Version: 1.2.2 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) From 404884ec06579c8701f52fa14c8d6ae82ae4c1b7c2dc8073d7596cac2ef11746 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 17 Sep 2014 10:23:39 +0000 Subject: [PATCH 4/5] 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) From a1392c18890e9a0bf6438ad1c2269627ec2eff9acb98e769ad9f7f94576848ae Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 17 Sep 2014 10:25:44 +0000 Subject: [PATCH 5/5] tweak OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord?expand=0&rev=108 --- colord.changes | 22 ++++++++++------------ colord.spec | 5 +---- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/colord.changes b/colord.changes index dba313a..c5bd3e4 100644 --- a/colord.changes +++ b/colord.changes @@ -2,18 +2,16 @@ 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 + + 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 diff --git a/colord.spec b/colord.spec index 8b6809b..5194a33 100644 --- a/colord.spec +++ b/colord.spec @@ -146,14 +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 +%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