Add conflict on icc-profiles-openicc

This commit is contained in:
Richard Hughes 2013-12-11 16:28:01 +00:00
parent f3f740cb38
commit 57cf1305d6

View File

@ -19,7 +19,7 @@
Summary: Color daemon Summary: Color daemon
Name: colord Name: colord
Version: 1.1.5 Version: 1.1.5
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
URL: http://www.freedesktop.org/software/colord/ URL: http://www.freedesktop.org/software/colord/
Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
@ -56,6 +56,7 @@ Requires: color-filesystem
Requires: systemd-units Requires: systemd-units
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires: colord-libs%{?_isa} = %{version}-%{release} Requires: colord-libs%{?_isa} = %{version}-%{release}
Conflicts: icc-profiles-openicc
# Self-obsoletes to fix the multilib upgrade path # Self-obsoletes to fix the multilib upgrade path
Obsoletes: colord < 0.1.27-3 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/* %{_datadir}/gtk-doc/html/colord/*
%changelog %changelog
* Wed Dec 11 2013 Richard Hughes <richard@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@hughsie.com> 1.1.5-1 * Wed Dec 11 2013 Richard Hughes <richard@hughsie.com> 1.1.5-1
- New upstream version - New upstream version
- Do not crash when moving the sensor position during calibration - Do not crash when moving the sensor position during calibration