From: Jakub Bogusz Date: Sun, 23 Jun 2013 06:46:10 +0000 (+0200) Subject: - sed fix to clean libpng paths, BR+R libpng-devel (for OpenType PNG-compressed bitmaps) X-Git-Tag: auto/th/freetype-2.5.0.1-2~2 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=a3d924dc9680a86f113b668d9af78e067881e5bb;p=packages%2Ffreetype.git - sed fix to clean libpng paths, BR+R libpng-devel (for OpenType PNG-compressed bitmaps) --- diff --git a/freetype.spec b/freetype.spec index 2cb8403..3181800 100644 --- a/freetype.spec +++ b/freetype.spec @@ -27,9 +27,11 @@ Patch0: freetype-2.2.1-enable-valid.patch URL: http://www.freetype.org/ BuildRequires: automake BuildRequires: bzip2-devel +BuildRequires: libpng-devel BuildRequires: python BuildRequires: python-modules BuildRequires: rpm >= 4.4.9-56 +BuildRequires: sed >= 4.0 %if "%{pld_release}" == "ac" %{?with_x11:BuildRequires: XFree86-devel} %else @@ -104,6 +106,7 @@ Summary(uk.UTF-8): Бібліотеки програміста для freetype Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: bzip2-devel +Requires: libpng-devel Requires: zlib-devel Obsoletes: freetype2-devel @@ -192,6 +195,9 @@ Programy demonstracyjne do biblioteki FreeType. %setup -q -a1 -a2 %patch0 -p1 +# avoid propagating -L%{_libdir} through *.la +%{__sed} -i -e 's,libpng-config --ldflags,libpng-config --libs,' builds/unix/configure + %build CFLAGS="%{rpmcflags} %{rpmcppflags} \ %{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING} \