add buildconflicts for now

diff --git a/freetype.spec b/freetype.spec
index ad9ec5510722bd3428a7759d043a0da797e227fc..860ef8e313fb29d95665f81a95bdeb6701c7a43f 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,5 +1,5 @@
 # TODO:
 # 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)
 #
 # 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
 %{?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)
 
 Obsoletes:     freetype2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)