[colord] Add conflict on icc-profiles-openicc

Richard Hughes rhughes at fedoraproject.org
Wed Dec 11 16:28:03 UTC 2013


commit 57cf1305d6f46c300954ce17eaac1ccd7ef723d3
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Dec 11 16:28:01 2013 +0000

    Add conflict on icc-profiles-openicc

 colord.spec |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/colord.spec b/colord.spec
index aff741c..3589f82 100644
--- a/colord.spec
+++ b/colord.spec
@@ -19,7 +19,7 @@
 Summary:   Color daemon
 Name:      colord
 Version:   1.1.5
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/colord/
 Source0:   http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
@@ -56,6 +56,7 @@ Requires: color-filesystem
 Requires: systemd-units
 Requires(pre): shadow-utils
 Requires: colord-libs%{?_isa} = %{version}-%{release}
+Conflicts: icc-profiles-openicc
 
 # Self-obsoletes to fix the multilib upgrade path
 Obsoletes: colord < 0.1.27-3
@@ -274,6 +275,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gtk-doc/html/colord/*
 
 %changelog
+* Wed Dec 11 2013 Richard Hughes <richard at hughsie.com> 1.1.5-2
+- Add conflict on icc-profiles-openicc
+- The OpenICC profiles are not really compatible for a few reasons:
+ * The profiles are duplicates of the ones shipped in the colord package
+ * The don't contain the correct metadata so the standard spaces show up in the
+   device profile chooser.
+ * The profiles don't contain an embedded ID, so colord has to hash them all
+   manually at startup, which makes colord look bad in bootchart
+ * A duplicate mime rule is installed which matches shared-mime-info one
+
 * Wed Dec 11 2013 Richard Hughes <richard at hughsie.com> 1.1.5-1
 - New upstream version
 - Do not crash when moving the sensor position during calibration


More information about the scm-commits mailing list