rpms/colord
7
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Rex Dieter 2014-02-28 11:43:14 -06:00
parent da7842c063
commit c39f6ac661
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
colord.spec
View File

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