From 545743689887de370c061c09c637ffe6179d7132 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 25 Sep 2008 11:05:06 +0000 Subject: [PATCH] - make it build on AC Changed files: freetype.spec -> 1.139 --- freetype.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/freetype.spec b/freetype.spec index 6384669..5d4d092 100644 --- a/freetype.spec +++ b/freetype.spec @@ -27,12 +27,17 @@ Source2: http://dl.sourceforge.net/freetype/ft2demos-%{version}.tar.bz2 URL: http://www.freetype.org/ BuildRequires: automake BuildRequires: python +BuildRequires: rpm >= 4.4.9-56 +%if "%{pld_release}" == "ac" +%{?with_x11:BuildRequires: XFree86-devel} +%else %{?with_x11:BuildRequires: xorg-lib-libX11-devel} +%endif BuildRequires: zlib-devel Obsoletes: freetype2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define specflags_ia32 -fomit-frame-pointer +%define specflags_ia32 -fomit-frame-pointer # see , the real horror %define specflags -fno-strict-aliasing @@ -191,12 +196,12 @@ CFLAGS="%{rpmcflags} \ CFG="--prefix=%{_prefix} --libdir=%{_libdir}" %{__make} \ - X11_LIB= + X11_LIB=%{?_x_libraries} %if %{with x11} %{__make} -C ft2demos-* \ - TOP_DIR="`pwd`" \ - X11_LIB= + TOP_DIR=$(pwd) \ + X11_LIB=%{?_x_libraries} %endif %{__make} refdoc -- 2.44.0