diff --git a/colord-0.1.15.tar.xz b/colord-0.1.15.tar.xz deleted file mode 100644 index 6226568..0000000 --- a/colord-0.1.15.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dff56476e02527899f4a2c39eeb092af369ab5dac1e21cbb6a5b0955b5c6e746 -size 456776 diff --git a/colord-0.1.16.tar.xz b/colord-0.1.16.tar.xz new file mode 100644 index 0000000..ddfe9c0 --- /dev/null +++ b/colord-0.1.16.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9489e29e7f5f529f759f7b913ccb8147e702bcdad641dfc1f94a1fc74dd942b1 +size 491252 diff --git a/colord-polkit-annotate-owner.patch b/colord-polkit-annotate-owner.patch deleted file mode 100644 index d124c74..0000000 --- a/colord-polkit-annotate-owner.patch +++ /dev/null @@ -1,354 +0,0 @@ -commit 9f088d598187b1bddd0ce4fb97a56d61564d8381 -Author: Vincent Untz -Date: Tue Dec 6 10:40:21 2011 +0100 - - Add org.freedesktop.policykit.owner annotations to .policy file - - We only add those annotations when the daemon is configured to run as - non-root. - -diff --git a/policy/Makefile.am b/policy/Makefile.am -index 85e3ecc..272675b 100644 ---- a/policy/Makefile.am -+++ b/policy/Makefile.am -@@ -1,9 +1,16 @@ -+org.freedesktop.color.policy.in: org.freedesktop.color.policy.in.in Makefile.am -+ $(AM_V_GEN)if test "x$(daemon_user)" != "xroot"; then \ -+ sed -e "s|<@ANNOTATE_OWNER@/>|unix-user:$(daemon_user)|g" $< > $@ ; \ -+ else \ -+ sed -e "/^\s*<@ANNOTATE_OWNER@\/>\s*$$/d;s|<@ANNOTATE_OWNER@/>||g" $< > $@ ; \ -+ fi -+ - @INTLTOOL_POLICY_RULE@ - polkit_policydir = $(datadir)/polkit-1/actions --dist_polkit_policy_DATA = \ -+polkit_policy_DATA = \ - org.freedesktop.color.policy - --EXTRA_DIST = org.freedesktop.color.policy.in --DISTCLEANFILES = org.freedesktop.color.policy -+EXTRA_DIST = org.freedesktop.color.policy.in.in -+DISTCLEANFILES = org.freedesktop.color.policy org.freedesktop.color.policy.in - - -include $(top_srcdir)/git.mk -diff --git a/policy/org.freedesktop.color.policy.in b/policy/org.freedesktop.color.policy.in -deleted file mode 100644 -index a5bcfaf..0000000 ---- a/policy/org.freedesktop.color.policy.in -+++ /dev/null -@@ -1,150 +0,0 @@ -- -- -- -- -- -- -- System Color Manager -- http://www.freedesktop.org/projects/system-color-manager/ -- application-vnd.iccprofile -- -- -- -- <_description>Create a color managed device -- <_message>Authentication is required to create a color managed device -- application-vnd.iccprofile -- -- no -- no -- yes -- -- -- -- -- -- <_description>Create a color profile -- <_message>Authentication is required to create a color profile -- application-vnd.iccprofile -- -- no -- no -- yes -- -- -- -- -- -- <_description>Remove a color managed device -- <_message>Authentication is required to remove a color managed device -- application-vnd.iccprofile -- -- no -- no -- yes -- -- -- -- -- -- <_description>Remove a color profile -- <_message>Authentication is required to remove a color profile -- application-vnd.iccprofile -- -- no -- no -- yes -- -- -- -- -- -- <_description>Modify color settings for a device -- <_message>Authentication is required to modify the color settings for a device -- application-vnd.iccprofile -- -- no -- no -- yes -- -- -- -- -- -- <_description>Modify a color profile -- <_message>Authentication is required to modify a color profile -- application-vnd.iccprofile -- -- no -- no -- yes -- -- -- -- -- -- <_description>Install system color profiles -- <_message>Authentication is required to install the color profile for all users -- application-vnd.iccprofile -- -- no -- no -- auth_admin_keep -- -- -- -- -- -- <_description>Inhibit color profile selection -- <_message>Authentication is required to disable profile matching for a device -- application-vnd.iccprofile -- -- no -- no -- yes -- -- -- -- -- -- <_description>Use color sensor -- <_message>Authentication is required to use the color sensor -- application-vnd.iccprofile -- -- no -- no -- yes -- -- -- -- -- -diff --git a/policy/org.freedesktop.color.policy.in.in b/policy/org.freedesktop.color.policy.in.in -new file mode 100644 -index 0000000..4570f8f ---- /dev/null -+++ b/policy/org.freedesktop.color.policy.in.in -@@ -0,0 +1,159 @@ -+ -+ -+ -+ -+ -+ -+ System Color Manager -+ http://www.freedesktop.org/projects/system-color-manager/ -+ application-vnd.iccprofile -+ -+ -+ -+ <_description>Create a color managed device -+ <_message>Authentication is required to create a color managed device -+ application-vnd.iccprofile -+ -+ no -+ no -+ yes -+ -+ <@ANNOTATE_OWNER@/> -+ -+ -+ -+ -+ <_description>Create a color profile -+ <_message>Authentication is required to create a color profile -+ application-vnd.iccprofile -+ -+ no -+ no -+ yes -+ -+ <@ANNOTATE_OWNER@/> -+ -+ -+ -+ -+ <_description>Remove a color managed device -+ <_message>Authentication is required to remove a color managed device -+ application-vnd.iccprofile -+ -+ no -+ no -+ yes -+ -+ <@ANNOTATE_OWNER@/> -+ -+ -+ -+ -+ <_description>Remove a color profile -+ <_message>Authentication is required to remove a color profile -+ application-vnd.iccprofile -+ -+ no -+ no -+ yes -+ -+ <@ANNOTATE_OWNER@/> -+ -+ -+ -+ -+ <_description>Modify color settings for a device -+ <_message>Authentication is required to modify the color settings for a device -+ application-vnd.iccprofile -+ -+ no -+ no -+ yes -+ -+ <@ANNOTATE_OWNER@/> -+ -+ -+ -+ -+ <_description>Modify a color profile -+ <_message>Authentication is required to modify a color profile -+ application-vnd.iccprofile -+ -+ no -+ no -+ yes -+ -+ <@ANNOTATE_OWNER@/> -+ -+ -+ -+ -+ <_description>Install system color profiles -+ <_message>Authentication is required to install the color profile for all users -+ application-vnd.iccprofile -+ -+ no -+ no -+ auth_admin_keep -+ -+ <@ANNOTATE_OWNER@/> -+ -+ -+ -+ -+ <_description>Inhibit color profile selection -+ <_message>Authentication is required to disable profile matching for a device -+ application-vnd.iccprofile -+ -+ no -+ no -+ yes -+ -+ <@ANNOTATE_OWNER@/> -+ -+ -+ -+ -+ <_description>Use color sensor -+ <_message>Authentication is required to use the color sensor -+ application-vnd.iccprofile -+ -+ no -+ no -+ yes -+ -+ <@ANNOTATE_OWNER@/> -+ -+ -+ -+ diff --git a/colord.changes b/colord.changes index c3180aa..835069f 100644 --- a/colord.changes +++ b/colord.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Jan 17 18:02:05 UTC 2012 - vuntz@opensuse.org + +- Update to version 0.1.16: + + New Features: + - Add a device-inhibit command to the colormgr client + - Add org.freedesktop.policykit.owner annotations to .policy + file + - Add profile metadata MAPPING_device_id for automatic profile + mapping + - Add some profile metadata keys + - Install a systemd service file if systemd is used + - Support 2nd generation Huey hardware + - Use GUsb for the Huey sensor + + Bugfixes: + - Fix a Wformat error when printing a gsize + - If /usr/share/color appears at runtime, don't rescan the + parent dir + - Set the colorimeter sensor group so the dameon can access the + sensor + - Split the spyder hardware into different types +- Add pkgconfig(systemd) BuildRequires, following upstream change, + to know where to install the .service file. +- Remove pkgconfig(libusb-1.0) BuildRequires: the dependency is + gone now. +- Drop colord-polkit-annotate-owner.patch: fixed upstream. +- Remove libtool BuildRequires and call to autoreconf and + intltoolize, that were only needed for above patch. + ------------------------------------------------------------------- Thu Dec 8 20:25:09 UTC 2011 - dimstar@opensuse.org diff --git a/colord.spec b/colord.spec index df3c4fe..d24f5f7 100644 --- a/colord.spec +++ b/colord.spec @@ -1,7 +1,7 @@ # # spec file for package colord # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # Name: colord -Version: 0.1.15 +Version: 0.1.16 Release: 0 Summary: System Daemon for Managing Color Devices License: GPL-2.0+ @@ -24,12 +24,8 @@ Group: System/Daemons Url: http://colord.hughsie.com/ Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM colord-polkit-annotate-owner.patch vuntz@opensuse.org -- Add org.freedesktop.policykit.owner annotations to policy file; will enter git very soon -Patch1: colord-polkit-annotate-owner.patch BuildRequires: gobject-introspection-devel BuildRequires: intltool -# needed for patch1 -BuildRequires: libtool BuildRequires: sane-backends-devel BuildRequires: vala # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 @@ -42,9 +38,9 @@ BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(libusb-1.0) >= 1.0.0 -BuildRequires: pkgconfig(polkit-gobject-1) +BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(systemd) Requires(pre): pwdutils Requires: shared-color-profiles Recommends: %{name}-lang @@ -91,12 +87,8 @@ there are no users logged in. %lang_package %prep %setup -q -%patch1 -p1 %build -# needed for patch1 -autoreconf -fi -intltoolize --force %configure \ --disable-static \ --enable-polkit \ @@ -131,6 +123,7 @@ exit 0 %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README +/lib/systemd/system/colord.service /lib/udev/rules.d/*.rules %attr(755,colord,colord) %dir %{_localstatedir}/lib/colord %config(noreplace) %{_sysconfdir}/%{name}.conf