From c23d07b979ebd51c0747b7abadd768505f9bdaf6eebe30ac4fdd023fad970a2d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Sat, 24 Oct 2015 06:47:51 +0000 Subject: [PATCH] Accepting request 340688 from home:StefanBruens:branches:M17N OBS-URL: https://build.opensuse.org/request/show/340688 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=111 --- ft2demos.changes | 6 ++++++ ft2demos.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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