From: Elan Ruusamäe Date: Wed, 10 Jun 2015 17:21:36 +0000 (+0300) Subject: add buildconflicts for now X-Git-Tag: auto/th/freetype-2.6.1-1~3 X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffreetype.git;a=commitdiff_plain;h=4f418421781f95869cc1444a1469add5a426bb9c add buildconflicts for now --- diff --git a/freetype.spec b/freetype.spec index ad9ec55..860ef8e 100644 --- a/freetype.spec +++ b/freetype.spec @@ -1,5 +1,5 @@ # TODO: -# - demos seem to use installed headers instead of these coming from new tarball +# - demos seem to use installed headers instead of these coming from new tarball (therefore buildconflicts) # # Conditional build: %bcond_without lcd # without LCD subpixel color filtering (Microsoft patents in USA) @@ -42,6 +42,7 @@ BuildRequires: sed >= 4.0 %{?with_x11:BuildRequires: xorg-lib-libX11-devel} %endif BuildRequires: zlib-devel +BuildConflicts: %{name}-devel < %{version} Obsoletes: freetype2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)