[packages/freetype] - sed fix to clean libpng paths, BR+R libpng-devel (for OpenType PNG-compressed bitmaps)

qboosh qboosh at pld-linux.org
Sun Jun 23 08:46:50 CEST 2013


commit a3d924dc9680a86f113b668d9af78e067881e5bb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jun 23 08:46:10 2013 +0200

    - sed fix to clean libpng paths, BR+R libpng-devel (for OpenType PNG-compressed bitmaps)

 freetype.spec | 6 ++++++
 1 file changed, 6 insertions(+)
---
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} \
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list