Author: glen Date: Thu Sep 25 11:05:12 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - make it build on AC
---- Files affected: SPECS: freetype.spec (1.138 -> 1.139) ---- Diffs: ================================================================ Index: SPECS/freetype.spec diff -u SPECS/freetype.spec:1.138 SPECS/freetype.spec:1.139 --- SPECS/freetype.spec:1.138 Fri Jul 18 21:51:28 2008 +++ SPECS/freetype.spec Thu Sep 25 13:05:06 2008 @@ -28,12 +28,17 @@ 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 <freetype/internal/ftserv.h>, the real horror %define specflags -fno-strict-aliasing @@ -192,12 +197,12 @@ 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 @@ -258,6 +263,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.139 2008/09/25 11:05:06 glen +- make it build on AC + Revision 1.138 2008/07/18 19:51:28 adamg - updated to 2.3.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/freetype.spec?r1=1.138&r2=1.139&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
