X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffreetype.git;a=blobdiff_plain;f=freetype.spec;h=ad9ec5510722bd3428a7759d043a0da797e227fc;hp=6123048699ded1bff7e9fd4b9989f93ecd34d61d;hb=775f3982a813c7abd929b9b6c8888121883483c0;hpb=e6872ee775b1fb13b2ef1eab2d969c8a7da09585

diff --git a/freetype.spec b/freetype.spec
index 6123048..ad9ec55 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,7 +1,10 @@
+# TODO:
+# - demos seem to use installed headers instead of these coming from new tarball
 #
 # 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,22 +15,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.2
+Version:	2.6
 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:	10e8f4d6a019b124088d18bc26123a25
+# Source0-md5:	5682890cb0267f6671dd3de6eabd3e69
 Source1:	http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5:	cb858209b8d84860345f3f62fcae2af2
+# Source1-md5:	f456b7ead3c351c7c218bb3afd45803c
 Source2:	http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5:	399d98441c6c67b5bf29c7733db27438
+# Source2-md5:	c6c209b37f10621d6ff100620b8292b4
 Patch0:		%{name}-2.2.1-enable-valid.patch
-Patch1:		%{name}-git.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
@@ -107,6 +110,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
@@ -195,23 +199,26 @@ Programy demonstracyjne do biblioteki FreeType.
 %prep
 %setup -q -a1 -a2
 %patch0 -p1
-%patch1 -p1
 
 # avoid propagating -L%{_libdir} through *.la
 %{__sed} -i -e 's,libpng-config --ldflags,libpng-config --libs,' builds/unix/configure
 
 %build
+CC="%{__cc}" \
 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}"
 
+CC="%{__cc}" \
 %{__make} \
 	X11_LIB=%{?_x_libraries}
 
 %if %{with x11}
+CC="%{__cc}" \
 %{__make} -C ft2demos-* \
 	TOP_DIR=$(pwd) \
 	X11_LIB=%{?_x_libraries}
@@ -253,6 +260,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/freetype2
 %{_aclocaldir}/freetype2.m4
 %{_pkgconfigdir}/freetype2.pc
+%{_mandir}/man1/freetype-config.1*
 
 %if %{with apidocs}
 %files apidocs