X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=freetype.spec;h=c7c84ac9687dac78e87dc173f90c7df20cc10c94;hb=d577620260f3b28259ce083b1bb0e4278b84b2c0;hp=ad61fbc1054bac4c06b8048d2ef9ee8e7a243b91;hpb=6da7ca3496765d2d2464950682dc25a6e27e0bac;p=packages%2Ffreetype.git

diff --git a/freetype.spec b/freetype.spec
index ad61fbc..c7c84ac 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -12,23 +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.8
+Version:	2.5.0.1
 Release:	2
 Epoch:		1
 License:	GPL v2 or FTL
 Group:		Libraries
-Source0:	http://downloads.sourceforge.net/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5:	dbf2caca1d3afd410a29217a9809d397
-Source1:	http://downloads.sourceforge.net/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5:	538c925059e90be23928b454c14df728
-Source2:	http://downloads.sourceforge.net/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5:	f44562cf0b434b6dc3488751f82d99ec
+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
@@ -102,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
 
@@ -151,7 +156,6 @@ Summary(ru.UTF-8):	Статические библиотеки freetype
 Summary(uk.UTF-8):	Статичні бібліотеки freetype
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
-Requires:	bzip2-static
 Obsoletes:	freetype2-static
 
 %description static
@@ -191,9 +195,14 @@ 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}" \
+%{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING} \
+-DTT_CONFIG_OPTION_SUBPIXEL_HINTING \
+" \
 %{__make} setup unix \
 	CFG="--prefix=%{_prefix} --libdir=%{_libdir}"