X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffreetype.git;a=blobdiff_plain;f=freetype.spec;h=80280280a0e96b997238cc343ed8d7a6ce8d6203;hp=c6157db33a3f9fd4837b959ac4d8d0ebdfe7dd8a;hb=46592d496a7b861df7e9c15ea0351636e2cf1a3e;hpb=8aa6eee45b79f5d03289d71b48b1de10ba59f964

diff --git a/freetype.spec b/freetype.spec
index c6157db..8028028 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -2,6 +2,7 @@
 # Conditional build:
 %bcond_without	lcd		# without LCD subpixel color filtering (Microsoft patents in USA)
 %bcond_without	x11		# don't build examples (X11-based)
+%bcond_without	harfbuzz	# harfbuzz based autohinting
 %bcond_without	apidocs         # disable api docs
 
 Summary:	TrueType font rasterizer
@@ -12,21 +13,22 @@ 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.5.0.1
+Version:	2.5.3
 Release:	1
 Epoch:		1
 License:	GPL v2 or FTL
 Group:		Libraries
 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
+# Source0-md5:	d6b60f06bfc046e43ab2a6cbfd171d65
+Source1:	http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.bz2
+# Source1-md5:	e192ef88e84ddf10665f34cf418652fb
+Source2:	http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
+# Source2-md5:	3d2cd9f572a1a80b9744b9d6b75975ba
+Patch0:		%{name}-2.2.1-enable-valid.patch
 URL:		http://www.freetype.org/
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
+%{?with_harfbuzz:BuildRequires:	harfbuzz-devel >= 0.9.19}
 BuildRequires:	libpng-devel
 BuildRequires:	python
 BuildRequires:	python-modules
@@ -106,6 +108,7 @@ Summary(uk.UTF-8):	Бібліотеки програміста для freetype
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	bzip2-devel
+%{?with_harfbuzz:Requires:	harfbuzz-devel >= 0.9.19}
 Requires:	libpng-devel
 Requires:	zlib-devel
 Obsoletes:	freetype2-devel
@@ -202,6 +205,7 @@ Programy demonstracyjne do biblioteki FreeType.
 CFLAGS="%{rpmcflags} %{rpmcppflags} \
 %{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING} \
 -DTT_CONFIG_OPTION_SUBPIXEL_HINTING \
+%{?with_harfbuzz:-DFT_CONFIG_OPTION_USE_HARFBUZZ} \
 " \
 %{__make} setup unix \
 	CFG="--prefix=%{_prefix} --libdir=%{_libdir}"
@@ -224,6 +228,8 @@ install -d $RPM_BUILD_ROOT%{_bindir}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+ln -s . $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype
+
 %if %{with x11}
 install -p ft2demos-*/bin/.libs/ft* $RPM_BUILD_ROOT%{_bindir}
 %endif
@@ -247,9 +253,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libfreetype.so
 %{_libdir}/libfreetype.la
 %{_includedir}/freetype2
-%{_includedir}/ft2build.h
 %{_aclocaldir}/freetype2.m4
 %{_pkgconfigdir}/freetype2.pc
+%{_mandir}/man1/freetype-config.1*
 
 %if %{with apidocs}
 %files apidocs