add buildconflicts for now

[packages/freetype.git] / freetype.spec

diff --git a/freetype.spec b/freetype.spec
index 042ecc007fb8d5b47db5d9bdc8f11d2e545b7dbe..860ef8e313fb29d95665f81a95bdeb6701c7a43f 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,3 +1,5 @@
+# TODO:
+# - 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)
@@ -13,17 +15,17 @@ Summary(pt_BR.UTF-8):       Biblioteca de renderização de fontes TrueType
 Summary(ru.UTF-8):     Растеризатор шрифтов TrueType
 Summary(uk.UTF-8):     Растеризатор шрифтів TrueType
 Name:          freetype
-Version:       2.5.5
+Version:       2.6
 Release:       1
 Epoch:         1
 License:       GPL v2 or FTL
 Group:         Libraries
 Source0:       http://download.savannah.gnu.org/releases/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5: 2a7a314927011d5030903179cf183be0
+# Source0-md5: 5682890cb0267f6671dd3de6eabd3e69
 Source1:       http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5: 6ffe7865943b3dfd6d04546ab7776a8f
+# Source1-md5: f456b7ead3c351c7c218bb3afd45803c
 Source2:       http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5: a30cf68418a468384515057eaca0f7fa
+# Source2-md5: c6c209b37f10621d6ff100620b8292b4
 Patch0:                %{name}-2.2.1-enable-valid.patch
 URL:           http://www.freetype.org/
 BuildRequires: automake
@@ -40,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)