[colord] revert Conflicts: icc-profiles-openicc pending (hopefully) better solution (#1069672)

[Rex Dieter]

commit c39f6ac661e2ec2fa59f9ab0b6ab6b7416f183f4
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Feb 28 11:43:14 2014 -0600

    revert Conflicts: icc-profiles-openicc pending (hopefully) better solution (#1069672)

 colord.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/colord.spec b/colord.spec
index b239bc7..f70a4a5 100644
--- a/colord.spec
+++ b/colord.spec
@@ -19,7 +19,7 @@
 Summary:   Color daemon
 Name:      colord
 Version:   1.1.6
-Release:   2%{?dist}
+Release:   3%{?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,7 +56,6 @@ 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
@@ -281,6 +280,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gtk-doc/html/colord/*
 
 %changelog
+* Fri Feb 28 2014 Rex Dieter <rdieter at fedoraproject.org> 1.1.6-3
+- revert Conflicts: icc-profiles-openicc pending (hopefully) better solution (#1069672)
+
 * Tue Jan 21 2014 Richard Hughes <richard at hughsie.com> 1.1.6-2
 - We don't actually need the valgrind BR...