diff --git a/ft2demos.changes b/ft2demos.changes index 1a8db31..1874bcf 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 23 23:34:06 UTC 2015 - stefan.bruens@rwth-aachen.de + +- no longer conflict dtc, flattened device tree tools are named + to no longer clash with ft2demos binaries since dtc 1.4 + ------------------------------------------------------------------- Sun Oct 4 22:24:26 UTC 2015 - baiduzhyi.devel@gmail.com diff --git a/ft2demos.spec b/ft2demos.spec index 2ebf72d..8abbaa6 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -40,7 +40,7 @@ Patch308961: bugzilla-308961-cmex-workaround.patch BuildRequires: libpng-devel BuildRequires: xorg-x11-devel Supplements: fonts-config -Conflicts: dtc +Conflicts: dtc < 1.4.0 # silence our clamav check NoSource: 1000 BuildRoot: %{_tmppath}/%{name}-%{version}-build