[packages/freetype] add buildconflicts for now

glen glen at pld-linux.org
Wed Jun 10 19:21:41 CEST 2015


commit 4f418421781f95869cc1444a1469add5a426bb9c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Jun 10 20:21:36 2015 +0300

    add buildconflicts for now

 freetype.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
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)
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/freetype.git/commitdiff/4f418421781f95869cc1444a1469add5a426bb9c



More information about the pld-cvs-commit mailing list