X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffreetype.git;a=blobdiff_plain;f=freetype.spec;h=c7c84ac9687dac78e87dc173f90c7df20cc10c94;hp=d16e7e23ef4f6544b3d6599e895c465a91f69ae3;hb=d577620260f3b28259ce083b1bb0e4278b84b2c0;hpb=8279c82d25e279fbcdf90d028e18ca7ade0c55b5

diff --git a/freetype.spec b/freetype.spec
index d16e7e2..c7c84ac 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -12,22 +12,26 @@ Summary(pt_BR.UTF-8):	Biblioteca de renderização de fontes TrueType
 Summary(ru.UTF-8):	Растеризатор шрифтов TrueType
 Summary(uk.UTF-8):	Растеризатор шрифтів TrueType
 Name:		freetype
-Version:	2.4.6
-Release:	1
+Version:	2.5.0.1
+Release:	2
 Epoch:		1
-License:	GPL or FTL
+License:	GPL v2 or FTL
 Group:		Libraries
-Source0:	http://downloads.sourceforge.net/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5:	5e6510613f612809d2d7862592b92ab7
-Source1:	http://downloads.sourceforge.net/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5:	e9ba39c2ca46e887e995d70f03284188
-Source2:	http://downloads.sourceforge.net/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5:	7d777ed105ec393170e007203fa1bbbe
+Source0:	http://download.savannah.gnu.org/releases/freetype/%{name}-%{version}.tar.bz2
+# Source0-md5:	c72e9010b1d986d556fc0b2b5fcbf31a
+Source1:	http://download.savannah.gnu.org/releases/freetype/%{name}-doc-2.5.0.tar.bz2
+# Source1-md5:	40f3d5cc0b16396b3fb6b98eeaa053b2
+Source2:	http://download.savannah.gnu.org/releases/freetype/ft2demos-2.5.0.tar.bz2
+# Source2-md5:	9bbea1989116715d3544d8439c8d2972
+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
@@ -101,6 +105,8 @@ Summary(ru.UTF-8):	Библиотеки разработчика для freetype
 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
 
@@ -187,10 +193,16 @@ Programy demonstracyjne do biblioteki FreeType.
 
 %prep
 %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} \
-%{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING}" \
+CFLAGS="%{rpmcflags} %{rpmcppflags} \
+%{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING} \
+-DTT_CONFIG_OPTION_SUBPIXEL_HINTING \
+" \
 %{__make} setup unix \
 	CFG="--prefix=%{_prefix} --libdir=%{_libdir}"